Received-SPF: pass (google.com: domain of linux-kernel+bounces-212452-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 13 Jun 2024 11:42:43 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>, Masami Hiramatsu
 <mhiramat@kernel.org>, Christian Brauner <brauner@kernel.org>
Cc: Christian =?UTF-8?B?R8O2dHRzY2hl?= <cgzones@googlemail.com>, Jiri Olsa
 <jolsa@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the ftrace tree with the vfs-brauner
 tree
Message-ID: <20240613114243.2a50059b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/xF37dqulSIjQfCC/XcTfBBj";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/xF37dqulSIjQfCC/XcTfBBj
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the ftrace tree got conflicts in:

  arch/x86/entry/syscalls/syscall_64.tbl
  include/uapi/asm-generic/unistd.h

between commit:

  e6873349f700 ("fs/xattr: add *at family syscalls")

from the vfs-brauner tree and commit:

  190fec72df4a ("uprobe: Wire up uretprobe system call")

from the ftrace 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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/x86/entry/syscalls/syscall_64.tbl
index 26af003921d2,6452c2ec469a..000000000000
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@@ -385,10 -384,7 +385,11 @@@
  460	common	lsm_set_self_attr	sys_lsm_set_self_attr
  461	common	lsm_list_modules	sys_lsm_list_modules
  462 	common  mseal			sys_mseal
 -463	64	uretprobe		sys_uretprobe
 +463	common	setxattrat		sys_setxattrat
 +464	common	getxattrat		sys_getxattrat
 +465	common	listxattrat		sys_listxattrat
 +466	common	removexattrat		sys_removexattrat
++467	64	uretprobe		sys_uretprobe
 =20
  #
  # Due to a historical design error, certain syscalls are numbered differe=
ntly
diff --cc include/uapi/asm-generic/unistd.h
index 5b8dab0b934e,2378f88d5ad4..000000000000
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@@ -845,17 -845,11 +845,20 @@@ __SYSCALL(__NR_lsm_list_modules, sys_ls
  #define __NR_mseal 462
  __SYSCALL(__NR_mseal, sys_mseal)
 =20
 -#define __NR_uretprobe 463
 +#define __NR_setxattrat 463
 +__SYSCALL(__NR_setxattrat, sys_setxattrat)
 +#define __NR_getxattrat 464
 +__SYSCALL(__NR_getxattrat, sys_getxattrat)
 +#define __NR_listxattrat 465
 +__SYSCALL(__NR_listxattrat, sys_listxattrat)
 +#define __NR_removexattrat 466
 +__SYSCALL(__NR_removexattrat, sys_removexattrat)
 +
++#define __NR_uretprobe 467
+ __SYSCALL(__NR_uretprobe, sys_uretprobe)
+=20
  #undef __NR_syscalls
- #define __NR_syscalls 467
 -#define __NR_syscalls 464
++#define __NR_syscalls 468
 =20
  /*
   * 32 bit systems traditionally used different

--Sig_/xF37dqulSIjQfCC/XcTfBBj
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZqTpMACgkQAVBC80lX
0Gyxugf+OyoGzMPb40i+163XGdy4bk47x//dbm0++u5gjsfFmZto4qBgjQ8rGTB0
JCo/lp8T9JM9r9rI400qSijsFAaCWtoFzykWCyHFIaVhpO0+YK87NMeWUcRSt1qF
4NKgQr4wyGhpGLlNbsgvo9d7ybHVuQp3byOLo3zZ7xG0n0R+EcYXYaZDsNlk8T8o
6nP5gH7iquDmj9btE6qwaZPqnpGpaj7/Fhgd6sUddA5G+ZKt6ewSY0XY0LcQ33+0
lZ4Mr/4KHUF3r01dw0d6R3eGatbKyK3siv8y01duGCwPH7O2J06XIC4L4sR+AhNy
3pZuoW4qGYkpkJ+dGlfmNb7IeEavxg==
=8NEG
-----END PGP SIGNATURE-----

--Sig_/xF37dqulSIjQfCC/XcTfBBj--