linux-kernel - linux-next: manual merge of the rockchip tree with the arm-soc 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>] [day] [month] [year] [list]

Message-ID: <aNERgQG1mxMRBRE6@finisterre.sirena.org.uk>
Date: Mon, 22 Sep 2025 10:08:24 +0100
From: Mark Brown <broonie@...nel.org>
To: Heiko Stuebner <heiko@...ech.de>
Cc: Andy Yan <andy.yan@...k-chips.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Nicolas Frattaroli <nicolas.frattaroli@...labora.com>
Subject: linux-next: manual merge of the rockchip tree with the arm-soc tree

Hi all,

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

  arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts

between commit:

  07c53a9e97071 ("arm64: dts: rockchip: Enable DP2HDMI for ROCK 5 ITX")

from the arm-soc tree and commit:

  dcc6785caffad ("arm64: dts: rockchip: fix second M.2 slot on ROCK 5T")

from the rockchip 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 --cc arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
index c1763835f53d4,a0c2b575f588f..0000000000000
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)