Re: linux-next: manual merge of the crypto tree with the kbuild tree

[Herbert Xu]

On Tue, Apr 11, 2017 at 10:21:19AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the crypto tree got a conflict in:
> 
>   include/linux/crypto.h
> 
> between commit:
> 
>   c394d1683e7c ("cryptouser.h: fix include from userland")
> 
> from the kbuild tree and commit:
> 
>   f437a3f477cc ("crypto: api - Extend algorithm name limit to 128 bytes")
> 
> from the crypto tree.
> 
> I fixed it up (I used the former version of this file and added the
> following merge fix patch) 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.

Actually the patch in the kbuild tree should be reverted because
we have now increased the in-kernel length limit and this must not
be directly exposed to user-space or it'll break compatibility.

Thanks,
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt