Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Wed, 18 Oct 2023 12:30:14 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Steven Rostedt <rostedt@goodmis.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Shuah Khan <shuah@kernel.org>
Cc:     Beau Belgrave <beaub@linux.microsoft.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shuah Khan <skhan@linuxfoundation.org>
Subject: linux-next: manual merge of the ftrace tree with the
 kselftest-fixes tree
Message-ID: <20231018123014.65073211@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CPS/Y=Y7WBQF=uC3bltgfsG";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/CPS/Y=Y7WBQF=uC3bltgfsG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  tools/testing/selftests/user_events/abi_test.c

between commit:

  cf5a103c98a6 ("selftests/user_events: Fix abi_test for BE archs")

from the kselftest-fixes tree and commit:

  cf74c59c4fc1 ("selftests/user_events: Test persist flag cases")

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 tools/testing/selftests/user_events/abi_test.c
index f5575ef2007c,3d539e556dcd..000000000000
--- a/tools/testing/selftests/user_events/abi_test.c
+++ b/tools/testing/selftests/user_events/abi_test.c
@@@ -47,7 -59,22 +59,22 @@@ static int change_event(bool enable
  	return ret;
  }
 =20
- static int reg_enable(void *enable, int size, int bit)
+ static int event_delete(void)
+ {
+ 	int fd =3D open(data_file, O_RDWR);
+ 	int ret;
+=20
+ 	if (fd < 0)
+ 		return -1;
+=20
+ 	ret =3D ioctl(fd, DIAG_IOCSDEL, "__abi_event");
+=20
+ 	close(fd);
+=20
+ 	return ret;
+ }
+=20
 -static int reg_enable_flags(long *enable, int size, int bit, int flags)
++static int reg_enable_flags(void *enable, int size, int bit, int flags)
  {
  	struct user_reg reg =3D {0};
  	int fd =3D open(data_file, O_RDWR);
@@@ -69,7 -97,12 +97,12 @@@
  	return ret;
  }
 =20
 -static int reg_enable(long *enable, int size, int bit)
++static int reg_enable(void *enable, int size, int bit)
+ {
+ 	return reg_enable_flags(enable, size, bit, 0);
+ }
+=20
 -static int reg_disable(long *enable, int bit)
 +static int reg_disable(void *enable, int bit)
  {
  	struct user_unreg reg =3D {0};
  	int fd =3D open(data_file, O_RDWR);

--Sig_/CPS/Y=Y7WBQF=uC3bltgfsG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUvNSYACgkQAVBC80lX
0Gxwjgf9HqrEE0VA/Wf2+JV+xnWVUo8ZsOFUjnlsiX4zKkOF2wuPb8UaUVA6SSx9
g1deOIUOgzaadC1+iqJfhkUvgBJcVY9IsHhdmnnaiP3OTAW6meuiLJNUGswkdO/8
74rcvpIPLLcCljWGHlBhdtFAi90NYKJh2nDu4bhdiRnqED9K8wjLGvKytWtBcGk6
DmMz4P/8ExI/2itNhkGlIItQ6EqECi4i1OYOOkv0wEqVuYU+s0zsfXgyxEIxUZ/v
BOpA2gpJspzjmGare2ucVtMbpPODIWGiR+joEDK7AvEFE/HOoU6OPYz5BcPpmjAY
gbs3wNfFOzFOJ494ujLxWmIJuYyQqQ==
=3GAp
-----END PGP SIGNATURE-----

--Sig_/CPS/Y=Y7WBQF=uC3bltgfsG--