Subject: Re: linux-next: manual merge of the tip tree with the loongarch tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 1 Apr 2025 15:42:06 +1100

Hi all,

On Mon, 3 Mar 2025 14:50:19 +1100 Stephen Rothwell <[email-masked]> 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