linux-next: manual merge of the ftrace tree with the origin tree

linux-next: manual merge of the ftrace tree with the origin tree

[Mark Brown]

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

Hi all,

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

  kernel/trace/trace_btf.h

between commit:

  3f942403bbad3 ("Merge tag 'probes-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace")

from the origin tree and commit:

  13d8f2241106d ("Merge remote-tracking branch 'ftrace/ftrace/for-next' into trace/merge/for-next")

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.

diff --combined kernel/trace/trace_btf.h
index b3d408e6a7f6c,54731bb4eab40..0000000000000
--- a/kernel/trace/trace_btf.h
+++ b/kernel/trace/trace_btf.h
@@@ -19,7 -19,6 +19,7 @@@ const struct btf_member *btf_find_struc
  						const char *member_name,
  						u32 *anon_offset,
  						const struct btf_type **container_type);
 +
  #ifdef CONFIG_DEBUG_INFO_BTF
  void btf_trim_retval(unsigned long func, unsigned long *retval, bool *print_retval,
  		     int *fmt, bool hex);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

linux-next: manual merge of the ftrace tree with the origin tree

[Mark Brown]

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

Hi all,

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

  tools/tracing/rtla/src/actions.c

between commit:

  b1e0ff7209e95 ("rtla: Fix buffer overflow in actions_parse")

from the origin tree and commit:

  05b7e10687c69 ("tools/rtla: Add remaining support for osnoise actions")

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.

diff --cc tools/tracing/rtla/src/actions.c
index 13ff1934d47c9,991139f9069f1..0000000000000
--- a/tools/tracing/rtla/src/actions.c
+++ b/tools/tracing/rtla/src/actions.c
@@@ -127,11 -127,11 +127,11 @@@ actions_add_continue(struct actions *se
   * actions_parse - add an action based on text specification
   */
  int
- actions_parse(struct actions *self, const char *trigger)
+ actions_parse(struct actions *self, const char *trigger, const char *tracefn)
  {
  	enum action_type type = ACTION_NONE;
- 	char *token;
+ 	const char *token;
 -	char trigger_c[strlen(trigger)];
 +	char trigger_c[strlen(trigger) + 1];
  
  	/* For ACTION_SIGNAL */
  	int signal = 0, pid = 0;

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