On 10/28/13 at 03:58pm, Borislav Petkov wrote: > 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 > git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git. Mind > you, not the 'efi-next' tag! I used the above tree origin/next branch > > 3. Then I merged the 'efi' branch of > git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git ontop. I used the patches from mailbox directly. Fixed an conflict and merge them one by one. > It gave a simple merge conflict which is trivial to resolve: > http://paste.debian.net/62579/ Looks like I can not access above link. > > Here I started applying your patches and the 3rd one still fails. > It's strange to me. There must be something wrong in the steps But sorry, it's time to sleep for me, will track this tommrrow. Thanks Dave
