[Intel-gfx] ✗ Fi.CI.BUILD: failure for efi/x86: Protect rtc_lock from interrupts

Patchwork patchwork at emeril.freedesktop.org
Mon Mar 2 13:51:52 UTC 2020


== Series Details ==

Series: efi/x86: Protect rtc_lock from interrupts
URL   : https://patchwork.freedesktop.org/series/74127/
State : failure

== Summary ==

Applying: efi/x86: Protect rtc_lock from interrupts
Using index info to reconstruct a base tree...
M	arch/x86/platform/efi/efi_64.c
Falling back to patching base and 3-way merge...
Auto-merging arch/x86/platform/efi/efi_64.c
CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 efi/x86: Protect rtc_lock from interrupts
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".



More information about the Intel-gfx mailing list