Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
From: Kevin Hilman <khilman@baylibre.com>
Date: 2017-01-18 19:15:51
Also in:
linux-arm-kernel, lkml
Possibly related (same subject, not in this thread)
- 2023-06-22 · linux-next: manual merge of the amlogic tree with the arm-soc tree · Stephen Rothwell <hidden>
- 2017-01-17 · linux-next: manual merge of the amlogic tree with the arm-soc tree · Stephen Rothwell <hidden>
- 2016-09-20 · Re: linux-next: manual merge of the amlogic tree with the arm-soc tree · Kevin Hilman <khilman@baylibre.com>
- 2016-09-20 · linux-next: manual merge of the amlogic tree with the arm-soc tree · Stephen Rothwell <hidden>
Stephen Rothwell [off-list ref] writes:
Hi all,
Today's linux-next merge of the amlogic tree got a conflict in:
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
between commit:
f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS")
from the arm-soc tree and commit:
47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx")
from the amlogic tree.The latter has been dropped from the amlogic pending some ongoing discussion, but I forgot to push an updated for-next. That's remedied now. Kevin