From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>, Jonathan Corbet <corbet@lwn•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Daniel Vetter <daniel.vetter@ffwll•ch>,
SeongJae Park <sj38.park@gmail•com>
Subject: linux-next: manual merge of the drm tree with the jc_docs tree
Date: Mon, 12 Dec 2016 11:57:53 +1100 [thread overview]
Message-ID: <20161212115753.4fac28f4@canb.auug.org.au> (raw)
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/driver-api/infrastructure.rst
between commits:
3080b056b3d4 ("docs/driver-api: Apply changed source file names")
868c97a846a7 ("dma-buf: Extract dma-buf.rst")
from the jc_docs tree and commit:
8a5846bf5d47 ("doc/dma-buf: Fix up include directives")
from the drm tree.
I fixed it up (the text modified by the latter was also modified by
commit 3080b056b3d4, then 868c97a846a7 moved it all to another 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
next reply other threads:[~2016-12-12 0:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 0:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-06-24 3:41 linux-next: manual merge of the drm tree with the jc_docs tree Stephen Rothwell
2019-07-08 23:54 ` Stephen Rothwell
2016-07-11 2:32 Stephen Rothwell
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=20161212115753.4fac28f4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=corbet@lwn$(echo .)net \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sj38.park@gmail$(echo .)com \
/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