Subject: linux-next: manual merge of the counter-next tree with the ti tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Jul 2024 16:37:49 +1000

Hi all,

Today's linux-next merge of the counter-next tree got a conflict in:

  arch/arm64/boot/dts/ti/k3-am62p-main.dtsi

between commits:

  3ad6579f106d ("arm64: dts: ti: am62p: Rename am62p-{}.dtsi to am62p-j722s-common-{}.dtsi")
  77044cfb9346 ("arm64: dts: ti: k3-am62p-j722s: Move AM62P specific USB1 to am62p-main.dtsi")
  ed07d82f9e3e ("arm64: dts: ti: k3-am62p-j722s: Move SoC-specific node properties")
  84935117f25f ("arm64: dts: ti: k3-am62p: Add gpio-ranges properties")

from the ti tree and commit:

  131eaf47c4c5 ("arm64: dts: ti: k3-am62p-main: Add eQEP nodes")

from the counter-next tree.

I don't know how to fix this up, so I just dropped the latter chanhd
for now.

-- 
Cheers,
Stephen Rothwell