libbpf: Expose libbpf ringbufer epoll_fd

[kernel-patches-bot]

Pull request for series with
subject: libbpf: Expose libbpf ringbufer epoll_fd
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=401457

[kernel-patches-bot]

Master branch: b4fe9fe
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=401457
version: 2

[kernel-patches-bot]

Master branch: 2e33f83
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=401457
version: 2

[kernel-patches-bot]

Master branch: a4d2a7a
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=401457
version: 2

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

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

conflict:

diff --cc tools/lib/bpf/libbpf.h
index 3c35eb401931,cde07f64771e..000000000000
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@@ -536,7 -536,7 +536,11 @@@ LIBBPF_API int ring_buffer__add(struct 
  				ring_buffer_sample_fn sample_cb, void *ctx);
  LIBBPF_API int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms);
  LIBBPF_API int ring_buffer__consume(struct ring_buffer *rb);
++<<<<<<< HEAD
 +LIBBPF_API int ring_buffer__epoll_fd(const struct ring_buffer *rb);
++=======
+ LIBBPF_API int ring_buffer__epoll_fd(struct ring_buffer *rb);
++>>>>>>> libbpf: Expose libbpf ringbufer epoll_fd
  
  /* Perf buffer APIs */
  struct perf_buffer;
diff --cc tools/lib/bpf/ringbuf.c
index a8f997d47adf,45a36648b403..000000000000
--- a/tools/lib/bpf/ringbuf.c
+++ b/tools/lib/bpf/ringbuf.c
@@@ -284,7 -284,7 +284,11 @@@ int ring_buffer__poll(struct ring_buffe
  }
  
  /* Get an fd that can be used to sleep until data is available in the ring(s) */
++<<<<<<< HEAD
 +int ring_buffer__epoll_fd(const struct ring_buffer *rb)
++=======
+ int ring_buffer__epoll_fd(struct ring_buffer *rb)
++>>>>>>> libbpf: Expose libbpf ringbufer epoll_fd
  {
  	return rb->epoll_fd;
  }

[kernel-patches-bot]

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