| Message ID | 20210128170331.4f2ac87b@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the gpio-brgl tree with the arm-soc tree | expand |
On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Today's linux-next merge of the gpio-brgl tree got a conflict in: > > arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > between commit: > > 4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC") > > from the arm-soc tree and commit: > > 08bc3941b6a4 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver") > > from the gpio-brgl 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 arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > index 37da418393e0,950010a290f0..000000000000 > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > @@@ -42,7 -42,6 +42,11 @@@ > clock-names = "apb_pclk"; > }; > > +&wdt { > + status = "okay"; > + clocks = <&wdt_clk>; > +}; > ++ > + &gpio { > + status = "okay"; > + }; Probably some sort order should be taken into account (gpio before uart0), also avoidng the conflict? Gr{oetje,eeting}s, Geert
On Tue, Feb 9, 2021 at 11:01 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > index 37da418393e0,950010a290f0..000000000000 > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > @@@ -42,7 -42,6 +42,11 @@@ > > clock-names = "apb_pclk"; > > }; > > > > +&wdt { > > + status = "okay"; > > + clocks = <&wdt_clk>; > > +}; > > ++ > > + &gpio { > > + status = "okay"; > > + }; > > Probably some sort order should be taken into account (gpio before uart0), > also avoidng the conflict? > We normally do this by asking everyone to send the dts changes for inclusion through the soc tree rather than the subsystem that contains the driver. Why is this one in the gpio-brgl tree? Arnd
Hi all, > -----Original Message----- > From: Arnd Bergmann [mailto:arnd@kernel.org] > Sent: Tuesday, February 9, 2021 8:36 PM > To: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Stephen Rothwell <sfr@canb.auug.org.au>; Bartosz Golaszewski <brgl@bgdev.pl>; Olof Johansson <olof@lixom.net>; > Arnd Bergmann <arnd@arndb.de>; ARM <linux-arm-kernel@lists.infradead.org>; Bartosz Golaszewski > <bgolaszewski@baylibre.com>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List > <linux-next@vger.kernel.org>; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@toshiba.co.jp> > Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree > > On Tue, Feb 9, 2021 at 11:01 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > > index 37da418393e0,950010a290f0..000000000000 > > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > > @@@ -42,7 -42,6 +42,11 @@@ > > > clock-names = "apb_pclk"; > > > }; > > > > > > +&wdt { > > > + status = "okay"; > > > + clocks = <&wdt_clk>; > > > +}; > > > ++ > > > + &gpio { > > > + status = "okay"; > > > + }; > > > > Probably some sort order should be taken into account (gpio before uart0), > > also avoidng the conflict? > > > > We normally do this by asking everyone to send the dts changes for > inclusion through the soc tree rather than the subsystem that contains > the driver. Why is this one in the gpio-brgl tree? Perhaps this is Bartosz's mistake. Linus has commented that gpio ml is captured via the soc tree. https://lore.kernel.org/linux-gpio/CACRpkdb--GSy-0vnAFS9Pik4TjrNRTrYeZr2RBZD6SFM8zotyQ@mail.gmail.com/ Bartosz, could you remove commit " arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver" from your tree? Best regards, Nobuhiro
diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts index 37da418393e0,950010a290f0..000000000000 --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts between commit: 4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC") from the arm-soc tree and commit: 08bc3941b6a4 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver") from the gpio-brgl 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.