From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greentime Hu <green.hu@gmail•com>
Cc: Masahiro Yamada <masahiroy@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the nds32 tree with the kbuild tree
Date: Tue, 18 Jan 2022 09:00:58 +1100 [thread overview]
Message-ID: <20220118090058.2c987ec6@canb.auug.org.au> (raw)
In-Reply-To: <20211025093813.2ebe9212@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
Hi all,
On Mon, 25 Oct 2021 09:38:13 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-01-17 22:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-24 22:38 linux-next: manual merge of the nds32 tree with the kbuild tree Stephen Rothwell
2022-01-17 22:00 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-22 11:45 broonie
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=20220118090058.2c987ec6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=green.hu@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
/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