From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Huacai Chen <chenhuacai@loongson•cn>
Cc: "Huacai Chen" <chenhuacai@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Nam Cao" <namcao@linutronix•de>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix•de>,
"Wentao Guan" <guanwentao@uniontech•com>,
"Yuli Wang" <wangyuli@uniontech•com>
Subject: linux-next: manual merge of the tip tree with the loongarch tree
Date: Mon, 3 Mar 2025 14:50:19 +1100 [thread overview]
Message-ID: <20250303145019.16b6b153@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/loongarch/Kconfig
between commit:
30051fca4509 ("LoongArch: Enable UBSAN (Undefined Behavior Sanitizer)")
from the loongarch tree and commit:
d2862bb9d9ca ("LoongArch: vDSO: Switch to generic storage implementation")
from the tip 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/loongarch/Kconfig
index 0043d5d4b5ea,d7ddf2a43e63..000000000000
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@@ -30,7 -30,7 +30,8 @@@ config LOONGARC
select ARCH_HAS_SET_MEMORY
select ARCH_HAS_SET_DIRECT_MAP
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ select ARCH_HAS_UBSAN
+ select ARCH_HAS_VDSO_ARCH_DATA
select ARCH_INLINE_READ_LOCK if !PREEMPTION
select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION
select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPTION
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-03 3:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-03 3:50 Stephen Rothwell [this message]
2025-04-01 4:42 ` linux-next: manual merge of the tip tree with the loongarch tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-05 3:56 Stephen Rothwell
2025-05-28 1:23 ` 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=20250303145019.16b6b153@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=guanwentao@uniontech$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=namcao@linutronix$(echo .)de \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=thomas.weissschuh@linutronix$(echo .)de \
--cc=wangyuli@uniontech$(echo .)com \
/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