linux-kernel - Re: linux-next: manual merge of the tip tree with the loongarch 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-prev] [day] [month] [year] [list]

Message-ID: <20250401154206.501b48d7@canb.auug.org.au>
Date: Tue, 1 Apr 2025 15:42:06 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Huacai Chen <chenhuacai@...ngson.cn>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Huacai Chen <chenhuacai@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Nam Cao <namcao@...utronix.de>, Thomas
 Weißschuh <thomas.weissschuh@...utronix.de>, Wentao Guan
 <guanwentao@...ontech.com>, Yuli Wang <wangyuli@...ontech.com>
Subject: Re: linux-next: manual merge of the tip tree with the loongarch
 tree

Hi all,

On Mon, 3 Mar 2025 14:50:19 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> 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.
> 
> 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

This is now a conflict between the loongarch tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped