linux-next: manual merge of the ftrace tree with the kselftest-fixes tree

* linux-next: manual merge of the ftrace tree with the kselftest-fixes tree
@ 2023-10-18  1:30 Stephen Rothwell
  2023-10-18 16:01 ` Shuah Khan
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-10-18  1:30 UTC (permalink / raw)
  To: Steven Rostedt, Masami Hiramatsu, Shuah Khan
  Cc: Beau Belgrave, Linux Kernel Mailing List,
	Linux Next Mailing List, Shuah Khan

[-- Attachment #1: Type: text/plain, Size: 1990 bytes --]

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.

-- 
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;
  }
  
- static int reg_enable(void *enable, int size, int bit)
+ static int event_delete(void)
+ {
+ 	int fd = open(data_file, O_RDWR);
+ 	int ret;
+ 
+ 	if (fd < 0)
+ 		return -1;
+ 
+ 	ret = ioctl(fd, DIAG_IOCSDEL, "__abi_event");
+ 
+ 	close(fd);
+ 
+ 	return ret;
+ }
+ 
 -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 = {0};
  	int fd = open(data_file, O_RDWR);
@@@ -69,7 -97,12 +97,12 @@@
  	return ret;
  }
  
 -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);
+ }
+ 
 -static int reg_disable(long *enable, int bit)
 +static int reg_disable(void *enable, int bit)
  {
  	struct user_unreg reg = {0};
  	int fd = open(data_file, O_RDWR);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread