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

9 messages, 5 authors, 2021-02-17 · open the first message on its own page

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

From: Stephen Rothwell <hidden>
Date: 2021-02-16 02:06:01

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e,48fa8776e36f..000000000000

--- 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";
++};`
++
+ &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>;
+ 		};
+ 	};
  };
diff --cc arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
index 4264f3e6ac9c,3366786699fc..000000000000

--- a/arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708.dtsi

@@@ -134,12 -134,20 +134,26 @@@
  		#clock-cells = <0>;
  	};
  
 +	wdt_clk: wdt-clk {
 +		compatible = "fixed-clock";
 +		clock-frequency = <150000000>;
 +		#clock-cells = <0>;
 +	};
 +
+ 	clk125mhz: clk125mhz {
+ 		compatible = "fixed-clock";
+ 		clock-frequency = <125000000>;
+ 		#clock-cells = <0>;
+ 		clock-output-names = "clk125mhz";
+ 	};
+ 
+ 	clk300mhz: clk300mhz {
+ 		compatible = "fixed-clock";
+ 		clock-frequency = <300000000>;
+ 		#clock-cells = <0>;
+ 		clock-output-names = "clk300mhz";
+ 	};
+ 
  	soc {
  		#address-cells = <2>;
  		#size-cells = <2>;
@@@ -402,11 -399,16 +416,22 @@@
  			status = "disabled";
  		};
  
 +		wdt: wdt@28330000 {
 +			compatible = "toshiba,visconti-wdt";
 +			reg = <0 0x28330000 0 0x1000>;
 +			status = "disabled";
 +		};
++
+ 		piether: ethernet@28000000 {
+ 			compatible = "toshiba,visconti-dwmac", "snps,dwmac-4.20a";
+ 			reg = <0 0x28000000 0 0x10000>;
+ 			interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+ 			interrupt-names = "macirq";
+ 			snps,txpbl = <4>;
+ 			snps,rxpbl = <4>;
+ 			snps,tso;
+ 			status = "disabled";
+ 		};
  	};
  };

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

From: <hidden>
Date: 2021-02-16 02:23:40

Hi,

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
Sent: Tuesday, February 16, 2021 11:05 AM
To: David Miller <davem@davemloft.net>; Networking <redacted>; Olof Johansson <redacted>; Arnd
Bergmann [off-list ref]; ARM [off-list ref]
Cc: Bartosz Golaszewski <redacted>; Linux Kernel Mailing List <redacted>; Linux
Next Mailing List [off-list ref]; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ)
[off-list ref]
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

From: Arnd Bergmann <arnd@kernel.org>
Date: 2021-02-16 10:12:56

On Tue, Feb 16, 2021 at 3:20 AM [off-list ref] wrote:

quoted

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 soc@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

From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Date: 2021-02-16 11:55:47

Hi,

From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM

<snip>

quoted hunk

diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e,48fa8776e36f..000000000000

--- 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

From: Naresh Kamboju <hidden>
Date: 2021-02-16 12:29:49

On Tue, 16 Feb 2021 at 17:26, Yoshihiro Shimoda
[off-list ref] wrote:

Hi,

quoted

From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM

<snip>

quoted

diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e,48fa8776e36f..000000000000

--- 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

From: <hidden>
Date: 2021-02-16 13:50:40

Hi,

Thnaks for your report.

LKFT builders also found this problem while building arm64 dtb.

quoted

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

From: <hidden>
Date: 2021-02-16 14:24:12

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 <redacted>; Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>; Stephen
Rothwell [off-list ref]
Cc: David Miller <davem@davemloft.net>; Networking <redacted>; Olof Johansson <redacted>; Arnd
Bergmann [off-list ref]; ARM [off-list ref]; Bartosz Golaszewski
[off-list ref]; Linux Next Mailing List [off-list ref]; Linux Kernel Mailing List
[off-list ref]; lkft-triage@lists.linaro.org
Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc tree

Hi,

Thnaks for your report.

quoted

LKFT builders also found this problem while building arm64 dtb.

quoted

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

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

From: Stephen Rothwell <hidden>
Date: 2021-02-16 21:18:38

Hi Yoshihiro,

On Tue, 16 Feb 2021 11:53:56 +0000 Yoshihiro Shimoda [off-list ref] wrote:

quoted

From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM

<snip>

quoted

diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e,48fa8776e36f..000000000000

--- 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

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

From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Date: 2021-02-17 00:25:24

Hi Stephen,

From: Stephen Rothwell, Sent: Wednesday, February 17, 2021 6:18 AM
On Tue, 16 Feb 2021 11:53:56 +0000 Yoshihiro Shimoda [off-list ref] wrote:

quoted

From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM

<snip>

quoted

diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e,48fa8776e36f..000000000000

--- 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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help