RE: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree

2021-02-09 Thread nobuhiro1.iwamatsu
; Linux Kernel Mailing List > ; Linux Next Mailing List > ; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) > > 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 > wrote: > > On

Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree

2021-02-09 Thread Arnd Bergmann
On Tue, Feb 9, 2021 at 11:01 AM Geert Uytterhoeven wrote: > On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell > wrote: > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > index 37da418393e0,950010a290f0.. > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > >

Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree

2021-02-09 Thread Geert Uytterhoeven
On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell 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