From: <nobuhiro1.iwamatsu@toshiba.co.jp>
To: <naresh.kamboju@linaro.org>, <yoshihiro.shimoda.uh@renesas.com>,
<sfr@canb.auug.org.au>
Cc: <davem@davemloft.net>, <netdev@vger.kernel.org>, <olof@lixom.net>,
<arnd@arndb.de>, <linux-arm-kernel@lists.infradead.org>,
<bgolaszewski@baylibre.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <lkft-triage@lists.linaro.org>
Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Tue, 16 Feb 2021 14:21:04 +0000 [thread overview]
Message-ID: <TYAPR01MB2990FAA79F1C3F3A0441721892879@TYAPR01MB2990.jpnprd01.prod.outlook.com> (raw)
In-Reply-To: <TYAPR01MB29904A0E8BE08D4BDFDA517C92879@TYAPR01MB2990.jpnprd01.prod.outlook.com>
[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]
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(岩松 信洋 □SWC◯ACT)
> Sent: Tuesday, February 16, 2021 10:47 PM
> To: Naresh Kamboju <naresh.kamboju@linaro.org>; Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>; Stephen
> Rothwell <sfr@canb.auug.org.au>
> Cc: David Miller <davem@davemloft.net>; Networking <netdev@vger.kernel.org>; Olof Johansson <olof@lixom.net>; Arnd
> Bergmann <arnd@arndb.de>; ARM <linux-arm-kernel@lists.infradead.org>; Bartosz Golaszewski
> <bgolaszewski@baylibre.com>; Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel Mailing List
> <linux-kernel@vger.kernel.org>; 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.
>
> > 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
[-- Attachment #2: 0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch --]
[-- Type: application/octet-stream, Size: 1151 bytes --]
From 7d852e61df20487efd2ae3627cce498b85d2e884 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Date: Tue, 16 Feb 2021 23:05:09 +0900
Subject: [PATCH] arm64: dts: visconti: Fix parse error for TMPV7708 RM main
board
The patch fix commit: c5e188ea08290d9 ("Merge remote-tracking branch
'net-next/master'").
This merge commit fixes tmpv7708-rm-mbrc.dts's conflict, but the typo
causes a parse error. This removes this typo.
ref: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 3760df93a89b57..230f487dd6b2e3 100644
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@ -49,7 +49,7 @@ &wdt {
&gpio {
status = "okay";
-};`
+};
&piether {
status = "okay";
--
2.30.0
next prev parent reply other threads:[~2021-02-16 14:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 2:04 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2021-02-16 2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11 ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28 ` Naresh Kamboju
2021-02-16 13:47 ` nobuhiro1.iwamatsu
2021-02-16 14:21 ` nobuhiro1.iwamatsu [this message]
2021-02-16 21:17 ` Stephen Rothwell
2021-02-17 0:23 ` Yoshihiro Shimoda
-- strict thread matches above, loose matches on Subject: below --
2022-07-13 2:55 Stephen Rothwell
2019-09-05 3:42 Stephen Rothwell
2016-12-01 1:31 Stephen Rothwell
2016-07-27 2:53 Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-06-21 1:18 Stephen Rothwell
2016-06-21 8:56 ` Arnd Bergmann
2016-05-10 0:18 Stephen Rothwell
2015-01-27 2:04 Stephen Rothwell
2014-09-25 2:58 Stephen Rothwell
2014-09-10 4:48 Stephen Rothwell
2014-09-10 8:06 ` Arnd Bergmann
2014-03-31 2:24 Stephen Rothwell
2012-01-04 4:06 Stephen Rothwell
2012-01-04 4:46 ` Richard Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=TYAPR01MB2990FAA79F1C3F3A0441721892879@TYAPR01MB2990.jpnprd01.prod.outlook.com \
--to=nobuhiro1.iwamatsu@toshiba.co.jp \
--cc=arnd@arndb.de \
--cc=bgolaszewski@baylibre.com \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lkft-triage@lists.linaro.org \
--cc=naresh.kamboju@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).