Stephen Rothwell <[email protected]> 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
