* linux-next: manual merge of the risc-v tree with the dma-mapping tree
@ 2018-12-06 23:02 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-12-06 23:02 UTC (permalink / raw)
To: Palmer Dabbelt, Christoph Hellwig
Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 826 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-12-06 23:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-06 23:02 linux-next: manual merge of the risc-v tree with the dma-mapping tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).