From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Maxime Ripard <maxime.ripard@bootlin.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the net-next tree
Date: Tue, 9 Jul 2019 10:15:07 +1000 [thread overview]
Message-ID: <20190709101507.3022b02e@canb.auug.org.au> (raw)
In-Reply-To: <20190628145626.49859e33@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]
Hi all,
On Fri, 28 Jun 2019 14:56:26 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/net/ethernet.txt
>
> between commit:
>
> 79b647a0c0d5 ("dt-bindings: net: document new usxgmii phy mode")
>
> from the net-next tree and commit:
>
> 4e7a33bff7d7 ("dt-bindings: net: Add YAML schemas for the generic Ethernet options")
>
> from the devicetree tree.
>
> I fixed it up (the latter seems to include the change made by the former,
> so I just used the latter) 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.
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-09 0:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 4:56 linux-next: manual merge of the devicetree tree with the net-next tree Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-29 1:50 Stephen Rothwell
2021-01-21 2:26 Stephen Rothwell
2021-02-14 20:53 ` Stephen Rothwell
2021-02-22 8:23 ` Stephen Rothwell
2021-02-22 10:35 ` Grygorii Strashko
2021-02-22 21:12 ` Stephen Rothwell
2020-05-15 5:28 Stephen Rothwell
2018-07-30 4:37 Stephen Rothwell
2018-08-15 3:14 ` Stephen Rothwell
2017-06-23 3:37 Stephen Rothwell
2014-02-14 3:16 Stephen Rothwell
2014-02-14 3:47 ` Florian Fainelli
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=20190709101507.3022b02e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@bootlin.com \
--cc=netdev@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).