From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Geert Uytterhoeven <geert@linux-m68k•org>
Cc: Cosmin Tanislav <cosmin-gabriel.tanislav.xa@renesas•com>,
Geert Uytterhoeven <geert+renesas@glider•be>,
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 tip tree with the renesas tree
Date: Mon, 5 Jan 2026 13:41:51 +1100 [thread overview]
Message-ID: <20260105134151.1302f303@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/boot/dts/renesas/r9a09g087.dtsi
between commit:
666e5eabd623 ("arm64: dts: renesas: r9a09g087: Add ICU support")
from the renesas tree and commit:
97232dc43e83 ("arm64: dts: renesas: r9a09g087: Add ICU support")
from the tip tree.
I fixed it up (I arbitrarily used the former version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-05 2:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-05 2:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 2:38 linux-next: manual merge of the tip tree with the renesas tree Stephen Rothwell
2026-01-05 10:04 ` Geert Uytterhoeven
2015-07-28 2:15 Stephen Rothwell
2014-03-17 5:31 Stephen Rothwell
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=20260105134151.1302f303@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cosmin-gabriel.tanislav.xa@renesas$(echo .)com \
--cc=geert+renesas@glider$(echo .)be \
--cc=geert@linux-m68k$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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