Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Teach verifier to determine necessary log buffer size #4845

Closed
wants to merge 1 commit into from

Conversation

kernel-patches-bot
Copy link

Pull request for series with
subject: Teach verifier to determine necessary log buffer size
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=735213

@kernel-patches-bot
Copy link
Author

Upstream branch: 4ca13d1
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=735213
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bpf: ignore verifier log reset in BPF_LOG_KERNEL mode
Using index info to reconstruct a base tree...
A	kernel/bpf/log.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): kernel/bpf/log.c deleted in HEAD and modified in bpf: ignore verifier log reset in BPF_LOG_KERNEL mode. Version bpf: ignore verifier log reset in BPF_LOG_KERNEL mode of kernel/bpf/log.c left in tree.
Patch failed at 0001 bpf: ignore verifier log reset in BPF_LOG_KERNEL mode
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:

* Unmerged path kernel/bpf/log.c

@kernel-patches-bot
Copy link
Author

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

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