Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: libbpf: deprecate bpf_perf_event_read_simple() API
Using index info to reconstruct a base tree...
M	tools/lib/bpf/libbpf.c
M	tools/lib/bpf/libbpf.h
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/bpf/libbpf.c
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Patch failed at 0001 libbpf: deprecate bpf_perf_event_read_simple() API
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'

diff --cc tools/lib/bpf/libbpf.c
index 1d02ba7f11b4,8a8020985db1..000000000000
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@@ -10678,8 -10678,8 +10678,13 @@@ struct bpf_link *bpf_map__attach_struct
  
  static enum bpf_perf_event_ret
  perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
++<<<<<<< HEAD
 +		       void **copy_mem, size_t *copy_size,
 +		       bpf_perf_event_print_t fn, void *private_data)
++=======
+ 			   void **copy_mem, size_t *copy_size,
+ 			   bpf_perf_event_print_t fn, void *private_data)
++>>>>>>> libbpf: deprecate bpf_perf_event_read_simple() API
  {
  	struct perf_event_mmap_page *header = mmap_mem;
  	__u64 data_head = ring_buffer_read_head(header);
@@@ -10724,11 -10724,14 +10729,22 @@@
  	return libbpf_err(ret);
  }
  
++<<<<<<< HEAD
 +__attribute__((alias("perf_event_read_simple")))
 +enum bpf_perf_event_ret
 +bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
 +			   void **copy_mem, size_t *copy_size,
 +			   bpf_perf_event_print_t fn, void *private_data);
++=======
+ enum bpf_perf_event_ret
+ bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
+ 			   void **copy_mem, size_t *copy_size,
+ 			   bpf_perf_event_print_t fn, void *private_data)
+ {
+ 	return perf_event_read_simple(mmap_mem, mmap_size, page_size, copy_mem,
+ 				      copy_size, fn, private_data);
+ }
++>>>>>>> libbpf: deprecate bpf_perf_event_read_simple() API
  
  struct perf_buffer;
  
@@@ -11139,9 -11142,9 +11155,15 @@@ static int perf_buffer__process_records
  	enum bpf_perf_event_ret ret;
  
  	ret = perf_event_read_simple(cpu_buf->base, pb->mmap_size,
++<<<<<<< HEAD
 +				     pb->page_size, &cpu_buf->buf,
 +				     &cpu_buf->buf_size,
 +				     perf_buffer__process_record, cpu_buf);
++=======
+ 					 pb->page_size, &cpu_buf->buf,
+ 					 &cpu_buf->buf_size,
+ 					 perf_buffer__process_record, cpu_buf);
++>>>>>>> libbpf: deprecate bpf_perf_event_read_simple() API
  	if (ret != LIBBPF_PERF_EVENT_CONT)
  		return ret;
  	return 0;