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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240701163749.1cb88c8b@canb.auug.org.au>
Date: Mon, 1 Jul 2024 16:37:49 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: William Breathitt Gray <wbg@...nel.org>, Nishanth Menon <nm@...com>,
 Tero Kristo <kristo@...nel.org>, Santosh Shilimkar <ssantosh@...nel.org>
Cc: Judith Mendez <jm@...com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Siddharth Vadapalli <s-vadapalli@...com>,
 Vignesh Raghavendra <vigneshr@...com>
Subject: linux-next: manual merge of the counter-next tree with the ti tree

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

Content of type "application/pgp-signature" skipped