lkml.org 
[lkml]   [2018]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the risc-v tree with the dma-mapping tree
Hi all,

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

Documentation/features/io/sg-chain/arch-support.txt

between commit:

7c703e54cc71 ("arch: switch the default on ARCH_HAS_SG_CHAIN")

from the dma-mapping tree and commits:

1df4d3866118 ("doc: features-refresh.sh for csky")
1b9f89553571 ("doc: Indicate that xtensa supports sg-chain")

from the risc-v tree.

I fixed it up (I deleted 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: 2018-12-07 00:03    [W:0.024 / U:3.348 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site