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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240709100154.0b4b1372@canb.auug.org.au>
Date: Tue, 9 Jul 2024 10:01:54 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Huacai Chen <chenhuacai@...ngson.cn>, Arnd Bergmann <arnd@...db.de>
Cc: Huacai Chen <chenhuacai@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the loongarch tree with the asm-generic
 tree

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>

Content of type "application/pgp-signature" skipped