sleepable uprobe support

[kernel-patches-bot]

Pull request for series with
subject: sleepable uprobe support
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=636682

[kernel-patches-bot]

Master branch: 9a9a90c
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=636682
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpf: move bpf_prog to bpf.h
Using index info to reconstruct a base tree...
M	include/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/bpf.h
Applying: bpf: implement sleepable uprobes by chaining tasks and normal rcu
Using index info to reconstruct a base tree...
M	include/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/bpf.h
CONFLICT (content): Merge conflict in include/linux/bpf.h
Patch failed at 0002 bpf: implement sleepable uprobes by chaining tasks and normal rcu
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.h
index 57ec619cf729,d8692d7176ce..000000000000
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@@ -25,7 -25,7 +25,11 @@@
  #include <linux/percpu-refcount.h>
  #include <linux/stddef.h>
  #include <linux/bpfptr.h>
++<<<<<<< HEAD
 +#include <linux/btf.h>
++=======
+ #include <linux/rcupdate_trace.h>
++>>>>>>> bpf: implement sleepable uprobes by chaining tasks and normal rcu
  
  struct bpf_verifier_env;
  struct bpf_verifier_log;

[kernel-patches-bot]

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