From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Huacai Chen <chenhuacai@loongson•cn>, Arnd Bergmann <arnd@arndb•de>
Cc: Huacai Chen <chenhuacai@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 loongarch tree with the asm-generic tree
Date: Wed, 17 Jul 2024 16:19:51 +1000 [thread overview]
Message-ID: <20240717161951.01e4737d@canb.auug.org.au> (raw)
In-Reply-To: <20240709100154.0b4b1372@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1555 bytes --]
Hi all,
On Tue, 9 Jul 2024 10:01:54 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the loongarch tree got a conflict in:
>
> arch/loongarch/include/uapi/asm/unistd.h
>
> between commits:
>
> 13aa27ce8de0 ("clone3: drop __ARCH_WANT_SYS_CLONE3 macro")
> 1d7b98ec5d78 ("loongarch: convert to generic syscall table")
>
> from the asm-generic tree and commit:
>
> a5d43e6d87c0 ("LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h")
>
> from the loongarch tree.
>
> I fixed it up (I think - 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/include/uapi/asm/unistd.h
> index 1f01980f9c94,b344b1f91715..000000000000
> --- a/arch/loongarch/include/uapi/asm/unistd.h
> +++ b/arch/loongarch/include/uapi/asm/unistd.h
> @@@ -1,3 -1,6 +1,4 @@@
> /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> + #define __ARCH_WANT_NEW_STAT
> -#define __ARCH_WANT_SYS_CLONE
> -#define __ARCH_WANT_SYS_CLONE3
>
> -#include <asm-generic/unistd.h>
> +#include <asm/unistd_64.h>
This is now a conflict between the loongarch tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-07-17 6:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 0:01 linux-next: manual merge of the loongarch tree with the asm-generic tree Stephen Rothwell
2024-07-09 6:00 ` Arnd Bergmann
2024-07-10 1:31 ` Stephen Rothwell
2024-07-17 6:19 ` Stephen Rothwell [this message]
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=20240717161951.01e4737d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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