Re: [patch 3/6] Cleanup efi_enter_virtual_mode function
From: Borislav Petkov
Date: Mon Oct 28 2013 - 10:58:14 EST
On Mon, Oct 28, 2013 at 07:24:58PM +0800, Dave Young wrote:
> I use linus tree, git pull Matt's efi-next tree, then apply your 12
> patches and my patches. I applied your previous 11 patches + the last
> update patch 12/12, but the last one does not apply, I manually shift
> a hunk to make it apply.
Nope, still doesn't apply.
patch -p1 --dry-run -i ~/efi/dy/03-efi-enter-virtual-mode-cleanup.patch
checking file arch/x86/platform/efi/efi.c
Hunk #1 succeeded at 788 (offset -1 lines).
Hunk #2 succeeded at 821 (offset -1 lines).
Hunk #3 FAILED at 853.
1 out of 3 hunks FAILED
and this time I took your patches from here: https://people.redhat.com/ruyang/kexec-efi/for-bp/kernel-patches/
What I did is:
1. I took Linus' tree from today
2. Merged the 'next' branch of
you, not the 'efi-next' tag!
3. Then I merged the 'efi' branch of
It gave a simple merge conflict which is trivial to resolve:
Here I started applying your patches and the 3rd one still fails.
Sent from a fat crate under my desk. Formatting is fine.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/