From: Emil Renner Berthing <kernel@esmil•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Ulf Hansson <ulf.hansson@linaro•org>,
Linus Walleij <linus.walleij@linaro•org>,
Hal Feng <hal.feng@starfivetech•com>,
Jianlong Huang <jianlong.huang@starfivetech•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
William Qiu <william.qiu@starfivetech•com>
Subject: Re: linux-next: manual merge of the pinctrl tree with the mmc tree
Date: Thu, 23 Feb 2023 10:58:36 +0100 [thread overview]
Message-ID: <CANBLGcxRJ+Hd2eqB7NFBCZEwV2CnLhkL3L1NCTvm5_fMt7PFPA@mail.gmail.com> (raw)
In-Reply-To: <20230223111342.7177513b@canb.auug.org.au>
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
next prev parent reply other threads:[~2023-02-23 9:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
-- strict thread matches above, loose matches on Subject: below --
2026-04-10 13:27 Mark Brown
2026-04-10 13:31 ` Mark Brown
2026-04-10 13:36 ` Ulf Hansson
2026-04-10 13:42 ` Mark Brown
2026-04-10 18:10 ` Linus Walleij
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=CANBLGcxRJ+Hd2eqB7NFBCZEwV2CnLhkL3L1NCTvm5_fMt7PFPA@mail.gmail.com \
--to=kernel@esmil$(echo .)dk \
--cc=hal.feng@starfivetech$(echo .)com \
--cc=jianlong.huang@starfivetech$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=ulf.hansson@linaro$(echo .)org \
--cc=william.qiu@starfivetech$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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