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

[Stephen Rothwell]

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")
  be01369859b8 ("esp, ah: modernize the crypto algorithm selections")

from the ipsec tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpD33Px6yFUM.pgp
Description: OpenPGP digital signature