selftests/bpf: Add stacktrace test for kprobe multi

[kernel-patches-daemon-bpf-rc]

Pull request for series with
subject: selftests/bpf: Add stacktrace test for kprobe multi
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1006137

[kernel-patches-daemon-bpf-rc]

Upstream branch: 5e3fee3
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1006137
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: selftests/bpf: Add stacktrace test for kprobe multi
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
Patch failed at 0001 selftests/bpf: Add stacktrace test for kprobe multi'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
index df59e4ae2951,922224adc86b..000000000000
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_map.c
@@@ -44,29 -75,7 +75,33 @@@ static void test_stacktrace_map_tp(void
  	/* give some time for bpf program run */
  	sleep(1);
  
++<<<<<<< HEAD
 +	/* disable stack trace collection */
 +	key = 0;
 +	val = 1;
 +	bpf_map_update_elem(control_map_fd, &key, &val, 0);
 +
 +	/* for every element in stackid_hmap, we can find a corresponding one
 +	 * in stackmap, and vise versa.
 +	 */
 +	err = compare_map_keys(stackid_hmap_fd, stackmap_fd);
 +	if (CHECK(err, "compare_map_keys stackid_hmap vs. stackmap",
 +		  "err %d errno %d\n", err, errno))
 +		goto disable_pmu;
 +
 +	err = compare_map_keys(stackmap_fd, stackid_hmap_fd);
 +	if (CHECK(err, "compare_map_keys stackmap vs. stackid_hmap",
 +		  "err %d errno %d\n", err, errno))
 +		goto disable_pmu;
 +
 +	stack_trace_len = PERF_MAX_STACK_DEPTH * sizeof(__u64);
 +	err = compare_stack_ips(stackmap_fd, stack_amap_fd, stack_trace_len);
 +	if (CHECK(err, "compare_stack_ips stackmap vs. stack_amap",
 +		  "err %d errno %d\n", err, errno))
 +		goto disable_pmu;
++=======
+ 	check_stackmap(control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd);
++>>>>>>> selftests/bpf: Add stacktrace test for kprobe multi
  
  disable_pmu:
  	bpf_link__destroy(link);

[kernel-patches-daemon-bpf-rc]

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