From: broonie@kernel.org
To: David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>
Cc: Conor Dooley <conor.dooley@microchip.com>,
Emil Renner Berthing <kernel@esmil.dk>,
Hal Feng <hal.feng@starfivetech.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Samin Guo <samin.guo@starfivetech.com>,
Yanhong Wang <yanhong.wang@starfivetech.com>
Subject: linux-next: manual merge of the net-next tree with the clk tree
Date: Wed, 19 Apr 2023 15:13:14 +0100 [thread overview]
Message-ID: <20230419141314.76640-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
MAINTAINERS
between commit:
63a30e1f44d5e ("MAINTAINERS: generalise StarFive clk/reset entries")
from the clk tree and commit:
b76eaf7d7ede3 ("dt-bindings: net: Add support StarFive dwmac")
from the net-next tree.
I fixed it up (see below) 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.
diff --cc MAINTAINERS
index 8c77a6a3f2c56,4fc57dfd5fd0a..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19911,6 -19928,20 +19937,13 @@@ M: Emil Renner Berthing <kernel@esmil.d
S: Maintained
F: arch/riscv/boot/dts/starfive/
+ STARFIVE DWMAC GLUE LAYER
+ M: Emil Renner Berthing <kernel@esmil.dk>
+ M: Samin Guo <samin.guo@starfivetech.com>
+ S: Maintained
+ F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+ F: drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+
-STARFIVE JH7100 CLOCK DRIVERS
-M: Emil Renner Berthing <kernel@esmil.dk>
-S: Maintained
-F: Documentation/devicetree/bindings/clock/starfive,jh7100-*.yaml
-F: drivers/clk/starfive/clk-starfive-jh7100*
-F: include/dt-bindings/clock/starfive-jh7100*.h
-
STARFIVE JH7110 MMC/SD/SDIO DRIVER
M: William Qiu <william.qiu@starfivetech.com>
S: Supported
next reply other threads:[~2023-04-19 14:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 14:13 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 2:09 linux-next: manual merge of the net-next tree with the clk tree Stephen Rothwell
2020-06-04 1:29 ` Stephen Rothwell
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=20230419141314.76640-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=davem@davemloft.net \
--cc=hal.feng@starfivetech.com \
--cc=kernel@esmil.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=samin.guo@starfivetech.com \
--cc=yanhong.wang@starfivetech.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).