Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm64/boot/dts/amlogic/Makefile
between commit:
593d311d9f17 ("ARM64: dts: meson-gxm: Add Vega S96 board")
from the arm-soc tree and commit:
4408a86af32e ("kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in
Makefile.lib")
from the devicetree tree.
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 may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/boot/dts/amlogic/Makefile
index b503e9b00cd3,4eb8f829472e..000000000000
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@@ -22,8 -19,3 +22,4 @@@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-n
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb
-
- always := $(dtb-y)
- subdir-y := $(dts-dirs)
- clean-files := *.dtb
