bpf: add bpf_msleep_interruptible() kfunc

[kernel-patches-daemon-bpf]

Pull request for series with
subject: bpf: add bpf_msleep_interruptible() kfunc
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=963081

[kernel-patches-daemon-bpf]

Upstream branch: b443265
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=963081
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bpf: add bpf_msleep_interruptible() kfunc
Using index info to reconstruct a base tree...
M	kernel/bpf/helpers.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/bpf/helpers.c
CONFLICT (content): Merge conflict in kernel/bpf/helpers.c
Patch failed at 0001 bpf: add bpf_msleep_interruptible() kfunc'
  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 kernel/bpf/helpers.c
index e3a2662f4e33,a7404ab3b0b8..000000000000
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -23,6 -23,8 +23,11 @@@
  #include <linux/btf_ids.h>
  #include <linux/bpf_mem_alloc.h>
  #include <linux/kasan.h>
++<<<<<<< HEAD
++=======
+ #include <linux/bpf_verifier.h>
+ #include <linux/delay.h>
++>>>>>>> bpf: add bpf_msleep_interruptible() kfunc
  
  #include "../../lib/kstrtox.h"