From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>, Christoph Hellwig <hch@lst•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Andrea Parri <andrea.parri@amarulasolutions•com>
Subject: linux-next: manual merge of the jc_docs tree with the dma-mapping tree
Date: Thu, 10 May 2018 11:38:29 +1000 [thread overview]
Message-ID: <20180510113829.513b3db9@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2018-05-10 1:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180510113829.513b3db9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrea.parri@amarulasolutions$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox