From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Otto Sabart <ottosabart@seberm.com>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Thu, 14 Feb 2019 14:02:16 +1100 [thread overview]
Message-ID: <20190214140216.72ad7d4a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
between commit:
8217724eb7c5 ("doc: bindings: fix bad reference to ARM CPU bindings")
from Linus' tree and commit:
36c79bc7ef79 ("dt-bindings: interrupt-controller: Convert ARM GICv3 to json-schema")
from the devicetree tree.
I fixed it up (the latter also did the update from the former, so I just
removed the 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-14 3:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 3:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-26 2:07 linux-next: manual merge of the devicetree tree with Linus' tree Stephen Rothwell
2025-02-26 2:41 ` Zijun Hu
2024-04-16 3:42 Stephen Rothwell
2022-01-14 23:41 Stephen Rothwell
2020-10-15 3:21 Stephen Rothwell
2019-11-12 2:57 Stephen Rothwell
2019-10-16 1:25 Stephen Rothwell
2019-07-24 3:02 Stephen Rothwell
2019-07-24 19:31 ` Rob Herring
2019-06-24 5:51 Stephen Rothwell
2019-07-08 23:56 ` Stephen Rothwell
2017-09-06 3:01 Stephen Rothwell
2017-09-06 2:55 Stephen Rothwell
2011-08-05 2:13 Stephen Rothwell
2010-07-16 1:15 Stephen Rothwell
2010-07-16 4:27 ` Grant Likely
2010-06-07 2:53 Stephen Rothwell
2010-06-07 17:03 ` Grant Likely
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=20190214140216.72ad7d4a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ottosabart@seberm.com \
--cc=robherring2@gmail.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