[lkml]   [2018]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the crypto tree with the asm-generic tree
Hi Herbert,

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


between commit:

1d77094897bc ("crypto: remove blackfin CRC driver")

from the asm-generic tree and commits:

f1b298103e14 ("crypto: bfin_crc - Add empty hash export and import")
5471f2e2b5ea ("crypto: bfin_crc - Delete an error message for a failed memory allocation in bfin_crypto_crc_probe()")

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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2018-03-15 03:52    [W:0.027 / U:1.624 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site