From: Mark Brown <broonie@kernel•org>
To: Heiko Stuebner <heiko@sntech•de>
Cc: Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the rockchip tree with the arm-soc tree
Date: Mon, 15 Sep 2025 18:21:33 +0100 [thread overview]
Message-ID: <aMhLHaSlc0O59qRi@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 941 bytes --]
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:
090be83a07923 ("Merge branch 'soc/dt' into for-next")
from the arm-soc tree and commit:
3f20580e1daba ("Merge branch 'v6.18-armsoc/dts64' into for-next")
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,e907e279bc98a..0000000000000
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-15 17:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 17:21 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-22 9:08 linux-next: manual merge of the rockchip tree with the arm-soc tree Mark Brown
2016-11-21 23:19 Stephen Rothwell
2016-11-21 23:38 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aMhLHaSlc0O59qRi@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=heiko@sntech$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox