Attach a cookie to a tracing program.

[kernel-patches-bot]

Pull request for series with
subject: Attach a cookie to a tracing program.
version: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=630138

[kernel-patches-bot]

Master branch: e58c5c9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=630138
version: 3

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=630138
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpf, x86: Generate trampolines from bpf_tramp_links
Using index info to reconstruct a base tree...
M	arch/x86/net/bpf_jit_comp.c
M	include/linux/bpf.h
M	include/linux/bpf_types.h
M	include/uapi/linux/bpf.h
M	kernel/bpf/syscall.c
M	kernel/bpf/trampoline.c
M	tools/bpf/bpftool/link.c
M	tools/include/uapi/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging tools/include/uapi/linux/bpf.h
CONFLICT (content): Merge conflict in tools/include/uapi/linux/bpf.h
Auto-merging tools/bpf/bpftool/link.c
CONFLICT (content): Merge conflict in tools/bpf/bpftool/link.c
Auto-merging kernel/bpf/trampoline.c
Auto-merging kernel/bpf/syscall.c
Auto-merging include/uapi/linux/bpf.h
CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
Auto-merging include/linux/bpf_types.h
CONFLICT (content): Merge conflict in include/linux/bpf_types.h
Auto-merging include/linux/bpf.h
Auto-merging arch/x86/net/bpf_jit_comp.c
Patch failed at 0001 bpf, x86: Generate trampolines from bpf_tramp_links
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc include/linux/bpf_types.h
index 3e24ad0c4b3c,8228c86eb92b..000000000000
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
@@@ -140,4 -140,4 +140,8 @@@ BPF_LINK_TYPE(BPF_LINK_TYPE_XDP, xdp
  #ifdef CONFIG_PERF_EVENTS
  BPF_LINK_TYPE(BPF_LINK_TYPE_PERF_EVENT, perf)
  #endif
++<<<<<<< HEAD
 +BPF_LINK_TYPE(BPF_LINK_TYPE_KPROBE_MULTI, kprobe_multi)
++=======
+ BPF_LINK_TYPE(BPF_LINK_TYPE_STRUCT_OPS, struct_ops)
++>>>>>>> bpf, x86: Generate trampolines from bpf_tramp_links
diff --cc include/uapi/linux/bpf.h
index d14b10b85e51,9e34da50440c..000000000000
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -1012,7 -1011,7 +1012,11 @@@ enum bpf_link_type 
  	BPF_LINK_TYPE_NETNS = 5,
  	BPF_LINK_TYPE_XDP = 6,
  	BPF_LINK_TYPE_PERF_EVENT = 7,
++<<<<<<< HEAD
 +	BPF_LINK_TYPE_KPROBE_MULTI = 8,
++=======
+ 	BPF_LINK_TYPE_STRUCT_OPS = 8,
++>>>>>>> bpf, x86: Generate trampolines from bpf_tramp_links
  
  	MAX_BPF_LINK_TYPE,
  };
diff --cc tools/bpf/bpftool/link.c
index 8fb0116f9136,d49a2bdc983f..000000000000
--- a/tools/bpf/bpftool/link.c
+++ b/tools/bpf/bpftool/link.c
@@@ -20,9 -20,7 +20,13 @@@ static const char * const link_type_nam
  	[BPF_LINK_TYPE_CGROUP]			= "cgroup",
  	[BPF_LINK_TYPE_ITER]			= "iter",
  	[BPF_LINK_TYPE_NETNS]			= "netns",
++<<<<<<< HEAD
 +	[BPF_LINK_TYPE_XDP]			= "xdp",
 +	[BPF_LINK_TYPE_PERF_EVENT]		= "perf_event",
 +	[BPF_LINK_TYPE_KPROBE_MULTI]		= "kprobe_multi",
++=======
+ 	[BPF_LINK_TYPE_STRUCT_OPS]               = "struct_ops",
++>>>>>>> bpf, x86: Generate trampolines from bpf_tramp_links
  };
  
  static struct hashmap *link_table;
diff --cc tools/include/uapi/linux/bpf.h
index d14b10b85e51,9e34da50440c..000000000000
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@@ -1012,7 -1011,7 +1012,11 @@@ enum bpf_link_type 
  	BPF_LINK_TYPE_NETNS = 5,
  	BPF_LINK_TYPE_XDP = 6,
  	BPF_LINK_TYPE_PERF_EVENT = 7,
++<<<<<<< HEAD
 +	BPF_LINK_TYPE_KPROBE_MULTI = 8,
++=======
+ 	BPF_LINK_TYPE_STRUCT_OPS = 8,
++>>>>>>> bpf, x86: Generate trampolines from bpf_tramp_links
  
  	MAX_BPF_LINK_TYPE,
  };

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=630138 expired. Closing PR.