linux-next: manual merge of the loongarch tree with the asm-generic tree

[Stephen Rothwell]

Hi all,

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>

Attachment: pgp8DWo2ATYTY.pgp
Description: OpenPGP digital signature