Stephen Rothwell <s...@canb.auug.org.au> writes: > Hi all, > > Today's linux-next merge of the amlogic tree got a conflict in: > > arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi > > between commit: > > 8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes") > > from the arm-soc tree and commit: > > d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes") > > from the amlogic tree. > > This patch was modified before being merged into the arm-soc tree. > Please clean up the amlogic tree.
Cleaned up. I forgot to push the updated amlogic/for-next after sending pull requests to arm-soc. Kevin