linux-kernel - linux-next: manual merge of the crypto 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20200511132319.2d39781b@canb.auug.org.au>
Date:   Mon, 11 May 2020 13:23:19 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Herbert Xu <herbert@...dor.apana.org.au>,
        Linux Crypto List <linux-crypto@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the crypto tree with Linus' tree

Hi all,

Today's linux-next merge of the crypto tree got conflicts in:

  crypto/lrw.c
  crypto/xts.c

between commit:

  1a263ae60b04 ("gcc-10: avoid shadowing standard library 'free()' in crypto")

from Linus' tree and commit:

  d099ea6e6fde ("crypto - Avoid free() namespace collision")

from the crypto tree.

I fixed it up (I just used the versions from the crypto tree) 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