* linux-next: manual merge of the pinctrl tree with the mmc tree
@ 2023-02-16 1:40 Stephen Rothwell
2023-02-23 0:13 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-02-16 1:40 UTC (permalink / raw)
To: Linus Walleij, Ulf Hansson
Cc: Emil Renner Berthing, Hal Feng, Jianlong Huang,
Linux Kernel Mailing List, Linux Next Mailing List, William Qiu
[-- Attachment #1: Type: text/plain, Size: 1880 bytes --]
Hi all,
Today's linux-next merge of the pinctrl tree got a conflict in:
MAINTAINERS
between commit:
9e622229bbf4 ("mmc: starfive: Add sdio/emmc driver support")
from the mmc tree and commit:
d6e0a660097d ("dt-bindings: pinctrl: Add StarFive JH7110 sys pinctrl")
from the pinctrl 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.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 1208b0380fa5,8a851eb053ca..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19914,19 -19890,15 +19914,21 @@@ F: Documentation/devicetree/bindings/cl
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
+F: Documentation/devicetree/bindings/mmc/starfive*
+F: drivers/mmc/host/dw_mmc-starfive.c
+
- STARFIVE JH7100 PINCTRL DRIVER
+ STARFIVE JH71X0 PINCTRL DRIVERS
M: Emil Renner Berthing <kernel@esmil.dk>
+ M: Jianlong Huang <jianlong.huang@starfivetech.com>
L: linux-gpio@vger.kernel.org
S: Maintained
- F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
- F: drivers/pinctrl/starfive/
+ F: Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
+ F: drivers/pinctrl/starfive/pinctrl-starfive-jh71*
F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
+ F: include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
STARFIVE JH7100 RESET CONTROLLER DRIVER
M: Emil Renner Berthing <kernel@esmil.dk>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the pinctrl tree with the mmc tree
2023-02-16 1:40 linux-next: manual merge of the pinctrl tree with the mmc tree Stephen Rothwell
@ 2023-02-23 0:13 ` Stephen Rothwell
2023-02-23 9:58 ` Emil Renner Berthing
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-02-23 0:13 UTC (permalink / raw)
To: Ulf Hansson
Cc: Linus Walleij, Emil Renner Berthing, Hal Feng, Jianlong Huang,
Linux Kernel Mailing List, Linux Next Mailing List, William Qiu
[-- Attachment #1: Type: text/plain, Size: 2173 bytes --]
Hi all,
On Thu, 16 Feb 2023 12:40:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 9e622229bbf4 ("mmc: starfive: Add sdio/emmc driver support")
>
> from the mmc tree and commit:
>
> d6e0a660097d ("dt-bindings: pinctrl: Add StarFive JH7110 sys pinctrl")
>
> from the pinctrl 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc MAINTAINERS
> index 1208b0380fa5,8a851eb053ca..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -19914,19 -19890,15 +19914,21 @@@ F: Documentation/devicetree/bindings/cl
> 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
> +F: Documentation/devicetree/bindings/mmc/starfive*
> +F: drivers/mmc/host/dw_mmc-starfive.c
> +
> - STARFIVE JH7100 PINCTRL DRIVER
> + STARFIVE JH71X0 PINCTRL DRIVERS
> M: Emil Renner Berthing <kernel@esmil.dk>
> + M: Jianlong Huang <jianlong.huang@starfivetech.com>
> L: linux-gpio@vger.kernel.org
> S: Maintained
> - F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
> - F: drivers/pinctrl/starfive/
> + F: Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
> + F: drivers/pinctrl/starfive/pinctrl-starfive-jh71*
> F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
> + F: include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
>
> STARFIVE JH7100 RESET CONTROLLER DRIVER
> M: Emil Renner Berthing <kernel@esmil.dk>
This is now a conflict between the mmc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the pinctrl tree with the mmc tree
2023-02-23 0:13 ` Stephen Rothwell
@ 2023-02-23 9:58 ` Emil Renner Berthing
0 siblings, 0 replies; 3+ messages in thread
From: Emil Renner Berthing @ 2023-02-23 9:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ulf Hansson, Linus Walleij, Hal Feng, Jianlong Huang,
Linux Kernel Mailing List, Linux Next Mailing List, William Qiu
On Thu, 23 Feb 2023 at 01:13, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 16 Feb 2023 12:40:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the pinctrl tree got a conflict in:
> >
> > MAINTAINERS
> >
> > between commit:
> >
> > 9e622229bbf4 ("mmc: starfive: Add sdio/emmc driver support")
> >
> > from the mmc tree and commit:
> >
> > d6e0a660097d ("dt-bindings: pinctrl: Add StarFive JH7110 sys pinctrl")
> >
> > from the pinctrl 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.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc MAINTAINERS
> > index 1208b0380fa5,8a851eb053ca..000000000000
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@@ -19914,19 -19890,15 +19914,21 @@@ F: Documentation/devicetree/bindings/cl
> > 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
> > +F: Documentation/devicetree/bindings/mmc/starfive*
> > +F: drivers/mmc/host/dw_mmc-starfive.c
> > +
> > - STARFIVE JH7100 PINCTRL DRIVER
> > + STARFIVE JH71X0 PINCTRL DRIVERS
> > M: Emil Renner Berthing <kernel@esmil.dk>
> > + M: Jianlong Huang <jianlong.huang@starfivetech.com>
> > L: linux-gpio@vger.kernel.org
> > S: Maintained
> > - F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
> > - F: drivers/pinctrl/starfive/
> > + F: Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
> > + F: drivers/pinctrl/starfive/pinctrl-starfive-jh71*
> > F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
> > + F: include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h
> >
> > STARFIVE JH7100 RESET CONTROLLER DRIVER
> > M: Emil Renner Berthing <kernel@esmil.dk>
>
> This is now a conflict between the mmc tree and Linus' tree.
Hi Stephen,
I don't control any of the trees, but fwiw your fixup looks correct to me:
Reviewed-by: Emil Renner Berthing <kernel@esmil.dk>
/Emil
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-23 9:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-16 1:40 linux-next: manual merge of the pinctrl tree with the mmc tree Stephen Rothwell
2023-02-23 0:13 ` Stephen Rothwell
2023-02-23 9:58 ` Emil Renner Berthing
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.