linux-next: manual merge of the ipsec tree with Linus' tree

Hi all, Today's linux-next merge of the ipsec tree got a conflict in: net/ipv6/Kconfig between commit: a7f7f6248d97 ("treewide: replace '---help---' in Kconfig files with 'help'") from Linus' tree and commits: 7d4e39195925 ("esp, ah: consolidate the crypto algorithm selections") be013

linux-next: manual merge of the ipsec tree with Linus' tree

Hi Steffen, Today's linux-next merge of the ipsec tree got a conflict in net/ipv4/ip_vti.c between commit 8d89dcdf80d8 ("vti: don't allow to add the same tunnel twice") from Linus' tree and commit a32452366b72 ("vti4: Don't count header length twice") from the ipsec tree. I fixed it up (see below