Skip to content

Conversation

@kernel-patches-daemon-bpf-rc
Copy link

Pull request for series with
subject: Backport minmax.h updates from v6.17-rc7
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1005840

@kernel-patches-daemon-bpf-rc
Copy link
Author

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

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: minmax: add in_range() macro
Patch failed at 0001 minmax: add in_range() macro'
  stderr: 'error: sha1 information is lacking or useless (drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c).
error: could not build fake ancestor
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:


@kernel-patches-daemon-bpf-rc
Copy link
Author

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=1005840 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

Development

Successfully merging this pull request may close these issues.

1 participant