diff mbox series

linux-next: manual merge of the qcom tree with the arm-soc tree

Message ID 20231204100355.0fb43204@canb.auug.org.au (mailing list archive)
State New, archived
Headers show
Series linux-next: manual merge of the qcom tree with the arm-soc tree | expand

Commit Message

Stephen Rothwell Dec. 3, 2023, 11:03 p.m. UTC 
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.
diff mbox series

Patch

diff --cc arch/arm/boot/dts/qcom/Makefile
index a3d293e40820,c13dddd3c683..000000000000
--- a/arch/arm/boot/dts/qcom/Makefile