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

2021-02-16 Thread Yoshihiro Shimoda
Hi Stephen, > From: Stephen Rothwell, Sent: Wednesday, February 17, 2021 6:18 AM > On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda > wrote: > > > > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM > > > > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > >

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

2021-02-16 Thread Stephen Rothwell
Hi Yoshihiro, On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda wrote: > > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM > > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > index 2407b2d89c1e,48fa8776e36f.. > > --- a/arch/arm64/boot/dts/to

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

2021-02-16 Thread nobuhiro1.iwamatsu
hiro Shimoda > ; Stephen > Rothwell > Cc: David Miller ; Networking ; > Olof Johansson ; Arnd > Bergmann ; ARM ; Bartosz > Golaszewski > ; Linux Next Mailing List > ; Linux Kernel Mailing List > ; lkft-tri...@lists.linaro.org > Subject: RE: linux-next: manual merge of

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

2021-02-16 Thread nobuhiro1.iwamatsu
Hi, Thnaks for your report. > LKFT builders also found this problem while building arm64 dtb. > > > This ` causes the following build error on the next-20210216. > > > > DTC arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb > > Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4

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

2021-02-16 Thread Naresh Kamboju
On Tue, 16 Feb 2021 at 17:26, Yoshihiro Shimoda wrote: > > Hi, > > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM > > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > index 2407b2d89c1e,48fa8776e36f.. > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-

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

2021-02-16 Thread Yoshihiro Shimoda
Hi, > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > index 2407b2d89c1e,48fa8776e36f.. > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts >

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

2021-02-16 Thread Arnd Bergmann
On Tue, Feb 16, 2021 at 3:20 AM wrote: > > > > 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

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

2021-02-15 Thread nobuhiro1.iwamatsu
Hi, > -Original Message- > From: Stephen Rothwell [mailto:s...@canb.auug.org.au] > Sent: Tuesday, February 16, 2021 11:05 AM > To: David Miller ; Networking ; > Olof Johansson ; Arnd > Bergmann ; ARM > Cc: Bartosz Golaszewski ; Linux Kernel Mailing > List ; Linux > Next Mailing List ; i

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

2016-07-27 Thread Duc Dang
On Tue, Jul 26, 2016 at 7:53 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/boot/dts/apm/apm-shadowcat.dtsi > > between commit: > > cafc4cd0c8b8 ("arm64: dts: apm: Use lowercase consistently for hex > constants") > > f

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

2016-06-21 Thread Arnd Bergmann
On Tuesday, June 21, 2016 11:18:39 AM CEST Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got conflicts in: > > arch/arm64/boot/dts/broadcom/ns2-svk.dts > arch/arm64/boot/dts/broadcom/ns2.dtsi > > between commits: > > 97b1504a30b3 ("arm64: dts: enable pinctrl for B

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

2014-09-10 Thread Arnd Bergmann
On Wednesday 10 September 2014 14:48:37 Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got a conflict in > arch/arm/boot/dts/rk3188-radxarock.dts between commit 4721ab855d1a > ("ARM: dts: rockchip: add hym8563 rtc to Radxa Rock board") from the > arm-soc tree and commit c6e