Hi all,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm/boot/dts/qcom/Makefile
between commits:
00400a98b2c3 ("ARM: dts: qcom: add device tree for Nokia Lumia 735")
8677233e5913 ("ARM: dts: qcom: add device tree for Nokia Lumia 830")
from the arm-soc tree and commit:
be0061dcbac1 ("ARM: dts: qcom: Add support for HTC One Mini 2")
from the qcom 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/arm/boot/dts/qcom/Makefile
index a3d293e40820,c13dddd3c683..000000000000
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@@ -32,8 -29,7 +32,9 @@@ dtb-$(CONFIG_ARCH_QCOM) +=
qcom-msm8916-samsung-e7.dtb \
qcom-msm8916-samsung-grandmax.dtb \
qcom-msm8916-samsung-serranove.dtb \
+ qcom-msm8926-htc-memul.dtb \
+ qcom-msm8926-microsoft-superman-lte.dtb \
+ qcom-msm8926-microsoft-tesla.dtb \
qcom-msm8960-cdp.dtb \
qcom-msm8960-samsung-expressatt.dtb \
qcom-msm8974-lge-nexus5-hammerhead.dtb \
Attachment:
pgpRKbqzjnJHf.pgp
Description: OpenPGP digital signature
