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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20200618091315.4ec8b8c2@canb.auug.org.au>
Date:   Thu, 18 Jun 2020 09:13:15 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steffen Klassert <steffen.klassert@...unet.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <masahiroy@...nel.org>,
        Eric Biggers <ebiggers@...gle.com>
Subject: 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")
  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

Content of type "application/pgp-signature" skipped