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

[Mark Brown]

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: signature.asc
Description: PGP signature