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>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Wed, 6 Sep 2017 13:01:35 +1000 [thread overview]
Message-ID: <20170906130135.1bc2c3a3@canb.auug.org.au> (raw)
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt
between commit:
ea6c3077678f ("dt-bindings: net: Remove duplicate NSP Ethernet MAC binding document")
from Linus' tree and commit:
4da722ca19f3 ("dt-bindings: Remove "status" from examples")
from the devicetree tree.
I fixed it up (the former removed the file, so I did that) 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:[~2017-09-06 3:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 3:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-16 3:42 linux-next: manual merge of the devicetree tree with Linus' tree 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
2019-02-14 3:02 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=20170906130135.1bc2c3a3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).