Skip to content

Conversation

kernel-patches-daemon-bpf[bot]
Copy link

Pull request for series with
subject: docs/bpf: clarify ret handling in LSM BPF programs
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1001294

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 91f34aa
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1001294
version: 2

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: docs/bpf: clarify ret handling in LSM BPF programs
Using index info to reconstruct a base tree...
Patch failed at 0001 docs/bpf: clarify ret handling in LSM BPF programs'
  stderr: 'error: patch failed: Documentation/bpf/prog_lsm.rst:66
error: Documentation/bpf/prog_lsm.rst: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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:


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants