| Message ID | 20230419141314.76640-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the clk tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc MAINTAINERS index 8c77a6a3f2c56,4fc57dfd5fd0a..0000000000000 --- a/MAINTAINERS
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. +++ 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