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

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

include/linux/sudmac.h

between commit:

49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311")

from Linus' tree and commit:

9a0f780958bb ("dmaengine: sudmac: remove unused driver")

from the slave-dma 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.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-06-11 08:33    [W:0.058 / U:0.176 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site