From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tom Cooksey <tom.cooksey@arm.com>, Eric Anholt <eric@anholt.net>
Subject: linux-next: manual merge of the drm-tegra tree with the drm tree
Date: Fri, 16 Jun 2017 11:12:02 +1000 [thread overview]
Message-ID: <20170616111202.7b9076aa@canb.auug.org.au> (raw)
Hi Thierry,
Today's linux-next merge of the drm-tegra tree got a conflict in:
Documentation/gpu/index.rst
between commit:
bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")
from the drm tree and commit:
fa6d095eb23a ("drm/tegra: Add driver documentation")
from the drm-tegra tree.
I fixed it up (see below) 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
diff --cc Documentation/gpu/index.rst
index 037a39ac1807,feae37fa7ca3..000000000000
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@@ -12,7 -12,7 +12,8 @@@ Linux GPU Driver Developer's Guid
drm-uapi
i915
meson
+ pl111
+ tegra
tinydrm
vc4
vga-switcheroo
next reply other threads:[~2017-06-16 1:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 1:12 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-23 16:30 linux-next: manual merge of the drm-tegra tree with the drm tree broonie
2022-02-28 3:30 ` Stephen Rothwell
2017-03-21 0:45 Stephen Rothwell
2017-03-21 14:10 ` Thierry Reding
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=20170616111202.7b9076aa@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=eric@anholt.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=tom.cooksey@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).