RE: linux-next: manual merge of the net-next tree with the arm-soc tree
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
> > > index 2407b2d89c1e,48fa8776e36f..
> > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > > @@@ -42,11 -42,20 +42,29 @@@
> > > clock-names = "apb_pclk";
> > > };
> > >
> > > +&wdt {
> > > +status = "okay";
> > > +clocks = <&wdt_clk>;
> > > +};
> > > +
> > > +&gpio {
> > > +status = "okay";
> > > ++};`
> >
> > 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 syntax error
> > FATAL ERROR: Unable to parse input tree
> > scripts/Makefile.lib:336: recipe for target
> > 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba'
> > failed
>
> Sorry about that ( ` is nect to ESC on my keyboard) it will be fixed up
> in today's resolution.
Thank you for the reply! I understood it.
Best regards,
Yoshihiro Shimoda
Re: linux-next: manual merge of the net-next tree with the arm-soc tree
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/toshiba/tmpv7708-rm-mbrc.dts
> > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > @@@ -42,11 -42,20 +42,29 @@@
> > clock-names = "apb_pclk";
> > };
> >
> > +&wdt {
> > + status = "okay";
> > + clocks = <&wdt_clk>;
> > +};
> > +
> > +&gpio {
> > + status = "okay";
> > ++};`
>
> 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 syntax error
> FATAL ERROR: Unable to parse input tree
> scripts/Makefile.lib:336: recipe for target
> 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba'
> failed
Sorry about that ( ` is nect to ESC on my keyboard) it will be fixed up
in today's resolution.
--
Cheers,
Stephen Rothwell
pgpsC0uCkxSH8.pgp
Description: OpenPGP digital signature
RE: linux-next: manual merge of the net-next tree with the arm-soc tree
Hi,
I attached a patch which revise this issue.
If I need to send with git send-email, please let me know.
Best regards,
Nobuhiro
> -Original Message-
> From: iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ)
> Sent: Tuesday, February 16, 2021 10:47 PM
> To: Naresh Kamboju ; Yoshihiro 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 the net-next tree with the arm-soc
> tree
>
> 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 syntax
> > > error
> > > FATAL ERROR: Unable to parse input tree
> > > scripts/Makefile.lib:336: recipe for target
> > > 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > > scripts/Makefile.build:530: recipe for target
> > > 'arch/arm64/boot/dts/toshiba' failed
> >
> > ref:
> > https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
> >
>
> This seems to be a problem fixing the conflict.
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c5e188ea08290d9b6625b4bef322012c0b
> 1902d7
>
> ```
> diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e9..3760df93a89b5 100644
> --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> @@ -49,4 +49,22 @@
>
> &gpio {
> status = "okay";
> +};`
> +
> +&piether {
> + status = "okay";
> + phy-handle = <&phy0>;
> + phy-mode = "rgmii-id";
> + clocks = <&clk300mhz>, <&clk125mhz>;
> + clock-names = "stmmaceth", "phy_ref_clk";
> +
> + mdio0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "snps,dwmac-mdio";
> + phy0: ethernet-phy@1 {
> + device_type = "ethernet-phy";
> + reg = <0x1>;
> + };
> + };
> };
> ```
>
> Stephen, could you fix this?
>
> Best regards,
> Nobuhiro
0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch
Description: 0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch
RE: linux-next: manual merge of the net-next tree with the arm-soc tree
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 syntax error
> > FATAL ERROR: Unable to parse input tree
> > scripts/Makefile.lib:336: recipe for target
> > 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba'
> > failed
>
> ref:
> https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
>
This seems to be a problem fixing the conflict.
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c5e188ea08290d9b6625b4bef322012c0b1902d7
```
diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e9..3760df93a89b5 100644
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@ -49,4 +49,22 @@
&gpio {
status = "okay";
+};`
+
+&piether {
+ status = "okay";
+ phy-handle = <&phy0>;
+ phy-mode = "rgmii-id";
+ clocks = <&clk300mhz>, <&clk125mhz>;
+ clock-names = "stmmaceth", "phy_ref_clk";
+
+ mdio0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "snps,dwmac-mdio";
+ phy0: ethernet-phy@1 {
+ device_type = "ethernet-phy";
+ reg = <0x1>;
+ };
+ };
};
```
Stephen, could you fix this?
Best regards,
Nobuhiro
Re: linux-next: manual merge of the net-next tree with the arm-soc tree
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-rm-mbrc.dts
> > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > @@@ -42,11 -42,20 +42,29 @@@
> > clock-names = "apb_pclk";
> > };
> >
> > +&wdt {
> > +status = "okay";
> > +clocks = <&wdt_clk>;
> > +};
> > +
> > +&gpio {
> > +status = "okay";
> > ++};`
>
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 syntax error
> FATAL ERROR: Unable to parse input tree
> scripts/Makefile.lib:336: recipe for target
> 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba'
> failed
ref:
https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
- Naresh
RE: linux-next: manual merge of the net-next tree with the arm-soc tree
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
> @@@ -42,11 -42,20 +42,29 @@@
> clock-names = "apb_pclk";
> };
>
> +&wdt {
> +status = "okay";
> +clocks = <&wdt_clk>;
> +};
> +
> +&gpio {
> +status = "okay";
> ++};`
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 syntax error
FATAL ERROR: Unable to parse input tree
scripts/Makefile.lib:336: recipe for target
'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba'
failed
Best regards,
Yoshihiro Shimoda
Re: linux-next: manual merge of the net-next tree with the arm-soc tree
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 may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > > > This is because the DTS changes are included in net-next. This patch should > be merged via the soc tree. > I had the same problem before. How is it correct to send a DTS patch? > Should I separate into different series? I have already sent the pull requests for the dts files to Linus, so that's not changing any more for this time, and he will just have to fix it up when he pulls both branches. In the future, please send all dts updates to s...@kernel.org (after the binding and driver is merged) rather than together with the device drivers. Sending the devicetree binding updates is a little trickier, as we tend to want them merged both with the driver and the dts files. One way to do this is to have a shared branch for the bindings updates, and then base both the driver branch and the dts branch on top of the same commits for that. A simpler alternative is to merge only the driver and binding changes in one release, and send the dts changes for the following release. This obviously takes longer to complete. Arnd
RE: linux-next: manual merge of the net-next tree with the arm-soc tree
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 ; iwamatsu nobuhiro(岩松 信洋
> □ＳＷＣ◯ＡＣＴ)
>
> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
>
> between commits:
>
> 4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
> 0109a17564fc ("arm: dts: visconti: Add DT support for Toshiba Visconti5
> GPIO driver")
>
> from the arm-soc tree and commit:
>
> ec8a42e73432 ("arm: dts: visconti: Add DT support for Toshiba Visconti5
> ethernet controller")
>
> from the net-next 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.
>
This is because the DTS changes are included in net-next. This patch should be
merged via the soc tree.
I had the same problem before. How is it correct to send a DTS patch?
Should I separate into different series?
Best regards,
Nobuhiro
Re: linux-next: manual merge of the net-next tree with the arm-soc tree
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")
>
> from the arm-soc tree and commit:
>
> 8e694cd2762c ("dtb: xgene: Add MDIO node")
>
> from the net-next 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.
Thanks for taking care of this, Stephen. The fix looks fine.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> index 21028b145d91,2e1e5daa1dc7..
> --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> @@@ -628,9 -636,9 +636,9 @@@
> sgenet0: ethernet@1f61 {
> compatible = "apm,xgene2-sgenet";
> status = "disabled";
> - reg = <0x0 0x1f61 0x0 0x1>,
> + reg = <0x0 0x1f61 0x0 0xd100>,
> -<0x0 0x1f60 0x0 0Xd100>,
> -<0x0 0x2000 0x0 0X2>;
> +<0x0 0x1f60 0x0 0xd100>,
> +<0x0 0x2000 0x0 0x2>;
> interrupts = <0 96 4>,
> <0 97 4>;
> dma-coherent;
Regards,
Duc Dang.
Re: linux-next: manual merge of the net-next tree with the arm-soc tree
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 Broadcom NS2 SoC")
> 5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support")
>
> from the arm-soc tree and commit:
>
> 5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node")
>
> from the net-next 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.
Looks good to me, thanks!
I don't see a good way to resolve the conflict before the merge window,
but it's simple enough that we can just send it this way and let
Linus handle it.
Arnd
