Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Wed, 6 Dec 2023 10:02:30 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paul Moore <paul@paul-moore.com>
Cc:     Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
        Namhyung Kim <namhyung@kernel.org>,
        Casey Schaufler <casey@schaufler-ca.com>,
        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 security tree with the
 perf-current tree
Message-ID: <20231206100230.7d29859d@canb.auug.org.au>
In-Reply-To: <20231123111005.432dfc56@canb.auug.org.au>
References: <20231123111005.432dfc56@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/y1vQADSf+/RAWWk.iKLskuq";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/y1vQADSf+/RAWWk.iKLskuq
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 23 Nov 2023 11:10:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the security tree got a conflict in:
>=20
>   tools/perf/arch/s390/entry/syscalls/syscall.tbl
>=20
> between commit:
>=20
>   d3968c974a24 ("tools/perf: Update tools's copy of s390 syscall table")
>=20
> from the perf-current tree and commit:
>=20
>   5f42375904b0 ("LSM: wireup Linux Security Module syscalls")
>=20
> from the security tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc tools/perf/arch/s390/entry/syscalls/syscall.tbl
> index 86fec9b080f6,5a422443cb16..000000000000
> --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl
> +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl
> @@@ -455,7 -455,6 +455,10 @@@
>   450  common	set_mempolicy_home_node	sys_set_mempolicy_home_node	sys_set=
_mempolicy_home_node
>   451  common	cachestat		sys_cachestat			sys_cachestat
>   452  common	fchmodat2		sys_fchmodat2			sys_fchmodat2
>  -453  common	lsm_get_self_attr	sys_lsm_get_self_attr	sys_lsm_get_self_at=
tr
>  -454  common	lsm_set_self_attr	sys_lsm_set_self_attr	sys_lsm_set_self_at=
tr
>  -455  common	lsm_list_modules	sys_lsm_list_modules	sys_lsm_list_modules
>  +453  common	map_shadow_stack	sys_map_shadow_stack		sys_map_shadow_stack
>  +454  common	futex_wake		sys_futex_wake			sys_futex_wake
>  +455  common	futex_wait		sys_futex_wait			sys_futex_wait
>  +456  common	futex_requeue		sys_futex_requeue		sys_futex_requeue
> ++459  common	lsm_get_self_attr	sys_lsm_get_self_attr	sys_lsm_get_self_at=
tr
> ++460  common	lsm_set_self_attr	sys_lsm_set_self_attr	sys_lsm_set_self_at=
tr
> ++461  common	lsm_list_modules	sys_lsm_list_modules	sys_lsm_list_modules

This is now a conflict between the security tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/y1vQADSf+/RAWWk.iKLskuq
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVvrAYACgkQAVBC80lX
0GzySwf9EBEfVAkDkcg9O0O1pd941Jefyxite3OjSVFaENBzYp49o/YpwViP37mu
xr4MOxB3BPI+bdplXI+ckZknfCsyysXJIzjSDrdtER1mN3cgFWS0owXCcSDsBgpU
mbQdWC9n6kPMl4WNGWqHE8QPMlA/TXJz0gwMvJ9R3/xSTF8+KDc0D+WX79T2p1lS
ak1fQElXzTE55f00vF0LKCoPUV9WLDqHrT5GS7nogojM+bYi6iFISNy1ank2TBdm
XxFtDqc/el2Nph8EWbI/0lCCHWQm2JaoutGbbaMZ+9f0WOYn5a0p75FYTX96jjTi
oBnnXdpz1WOF+82YosDNdhaALNsbZw==
=6+1Z
-----END PGP SIGNATURE-----

--Sig_/y1vQADSf+/RAWWk.iKLskuq--