* linux-next: manual merge of the jc_docs tree with the dma-mapping tree
@ 2018-05-10 1:38 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-05-10 1:38 UTC (permalink / raw)
To: Jonathan Corbet, Christoph Hellwig
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Andrea Parri
[-- Attachment #1: Type: text/plain, Size: 841 bytes --]
Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/features/io/dma-api-debug/arch-support.txt
between commit:
6e88628d03dd ("dma-debug: remove CONFIG_HAVE_DMA_API_DEBUG")
from the dma-mapping tree and commit:
7156fc292850 ("Documentation/features: Refresh the arch support status files in place")
from the jc_docs tree.
I fixed it up (I just remobved the file like the former commit did) 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-05-10 1:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-10 1:38 linux-next: manual merge of the jc_docs 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).