linux-kernel - Re: linux-next: manual merge of the staging tree with the crypto 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180816094903.7744e6b0@canb.auug.org.au>
Date:   Thu, 16 Aug 2018 09:49:03 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>
Cc:     Herbert Xu <herbert@...dor.apana.org.au>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Eric Biggers <ebiggers@...gle.com>,
        Jason Cooper <jason@...edaemon.net>
Subject: Re: linux-next: manual merge of the staging tree with the crypto
 tree

Hi all,

On Mon, 9 Jul 2018 14:15:10 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/skein/skein_generic.c
> 
> between commit:
> 
>   e50944e219f9 ("crypto: shash - remove useless setting of type flags")
> 
> from the crypto tree and commit:
> 
>   ee55fe552fcd ("staging/skein: Remove Skein and Threefish code")
> 
> from the staging tree.
> 
> I fixed it up (I removed the file) 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.

This is now a conflict between Linus' tree and the staging tree.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped