From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Harini Katakam <harini.katakam@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Pranavi Somisetty <pranavi.somisetty@amd.com>
Subject: linux-next: manual merge of the devicetree tree with the net-next tree
Date: Tue, 29 Aug 2023 11:50:35 +1000 [thread overview]
Message-ID: <20230829115035.3ccb367a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/net/xilinx_gmii2rgmii.txt
between commit:
c639a708a0b8 ("dt-bindings: net: xilinx_gmii2rgmii: Convert to json schema")
from the net-next tree and commit:
47aab53331ef ("dt-bindings: Fix typos")
from the devicetree tree.
I fixed it up (the former included the change from the latter, so I just
deleted this 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:[~2023-08-29 1:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 1:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-21 2:26 linux-next: manual merge of the devicetree tree with the net-next tree 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
2019-06-28 4:56 Stephen Rothwell
2019-07-09 0:15 ` 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=20230829115035.3ccb367a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=harini.katakam@amd.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pranavi.somisetty@amd.com \
--cc=robh@kernel.org \
/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).