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
> > >
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
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
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
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-
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
>
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
inux
> 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/tm
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: visco
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/nuvoton/w90p910_ether.c
between commit:
00d2fbf73d55 ("net: remove w90p910-ether driver")
from the arm-soc tree and commit:
d1a55841ab24 ("net: Remove dev_err() usage after platform_get_irq()")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
arch/arm64/boot/dts/broadcom/ns2.dtsi
between commit:
e79249143f46 ("arm64: dts: Add Broadcom Northstar2 device tree entries for
PDC driver.")
from the arm-soc tree and commit:
dddc3c9d7d02 ("arm64: dts: NS2: add
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
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")
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
Hi all,
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 suppor
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/soc/qcom/smd.h
between commit:
b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")
from the arm-soc tree and commit:
43315f31adc2 ("soc: qcom: smd: Introduce compile stubs")
from th
16 matches
Mail list logo
