lkml.org 
[lkml]   [2019]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the crypto tree with Linus' tree
Hi Herbert,

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

crypto/crypto_wq.c

between commit:

2874c5fd2842 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152")

from Linus' tree and commit:

3e56e168638b ("crypto: cryptd - move kcrypto_wq into cryptd")

from the crypto tree.

I fixed it up (I just 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.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-06-03 02:52    [W:0.040 / U:1.376 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site