From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>,
Stephen Warren <swarren@nvidia•com>,
Colin Cross <ccross@android•com>, Olof Johansson <olof@lixom•net>,
Thierry Reding <treding@nvidia•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alexandre Courbot <acourbot@nvidia•com>
Subject: linux-next: manual merge of the dt-rh tree with the tegra tree
Date: Wed, 27 Apr 2016 13:50:18 +1000 [thread overview]
Message-ID: <20160427135018.2aac12f4@canb.auug.org.au> (raw)
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
between commit:
53cafb93da6f ("dt-bindings: Add documentation for GM20B GPU")
from the tegra tree and commit:
f43521e95211 ("dt-bindings: tegra: Remove 0, prefix from unit-addresses")
from the dt-rh tree.
I fixed it up (they were very similar) 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
reply other threads:[~2016-04-27 3:50 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=20160427135018.2aac12f4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=acourbot@nvidia$(echo .)com \
--cc=ccross@android$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=robherring2@gmail$(echo .)com \
--cc=swarren@nvidia$(echo .)com \
--cc=treding@nvidia$(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