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

x86-module-prepare-module-loading-for-rox-allocations-of-text.patch removed from -mm tree #16

Open
wants to merge 1 commit into
base: main_base
Choose a base branch
from

Conversation

kdevops-kpd[bot]
Copy link

@kdevops-kpd kdevops-kpd bot commented Nov 7, 2024

Pull request for series with
subject: x86-module-prepare-module-loading-for-rox-allocations-of-text.patch removed from -mm tree
version: 1
url: https://patchwork.kernel.org/project/kdevops/list/?series=906697

@kdevops-kpd
Copy link
Author

kdevops-kpd bot commented Nov 7, 2024

Upstream branch: 362d27a
series: https://patchwork.kernel.org/project/kdevops/list/?series=906697
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: x86-module-prepare-module-loading-for-rox-allocations-of-text.patch removed from -mm tree
Patch failed at 0001 x86-module-prepare-module-loading-for-rox-allocations-of-text.patch removed from -mm tree'
  stderr: 'error: sha1 information is lacking or useless (arch/um/kernel/um_arch.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:


@kdevops-kpd kdevops-kpd bot force-pushed the main_base branch 9 times, most recently from bb28cc8 to b3e59b9 Compare November 12, 2024 23:50
@kdevops-kpd kdevops-kpd bot force-pushed the main_base branch 3 times, most recently from 7aad7c2 to 8ceccf4 Compare November 23, 2024 02:54
@kdevops-kpd kdevops-kpd bot force-pushed the main_base branch 2 times, most recently from f8bc71a to 31173fc Compare November 26, 2024 22:52
@kdevops-kpd kdevops-kpd bot force-pushed the main_base branch 2 times, most recently from cf57507 to 55dc51c Compare January 2, 2025 18:48
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