Subject: Re: linux-next: manual merge of the nds32 tree with the kbuild tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 18 Jan 2022 09:00:58 +1100

Hi all,

On Mon, 25 Oct 2021 09:38:13 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the nds32 tree got a conflict in:
> 
>   arch/nds32/Kbuild
> 
> between commit:
> 
>   8212f8986d31 ("kbuild: use more subdir- for visiting subdirectories while cleaning")
> 
> from the kbuild tree and commit:
> 
>   37160f01e8ea ("nds32: move core-y in arch/nds32/Makefile to arch/nds32/Kbuild")
> 
> from the nds32 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/nds32/Kbuild
> index 4e39f7abdeb6,565b9bc3c9db..000000000000
> --- a/arch/nds32/Kbuild
> +++ b/arch/nds32/Kbuild
> @@@ -1,4 -1,4 +1,7 @@@
>   # SPDX-License-Identifier: GPL-2.0-only
> + obj-y			+= kernel/ mm/
> + obj-$(CONFIG_FPU)	+= math-emu/
> + obj-y			+= boot/dts/
>  +
>  +# for cleaning
>  +subdir- += boot

I am still getting this conflict (and another on arch/nds32/Kconfig),
and so am wondering when the nds32 tree will be submitted to Linus for
merging?  It has not been updated since last September.

-- 
Cheers,
Stephen Rothwell