From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.skyhub.de ([78.46.96.112]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VaoIu-0007rL-V3 for kexec@lists.infradead.org; Mon, 28 Oct 2013 15:00:30 +0000 Date: Mon, 28 Oct 2013 15:58:01 +0100 From: Borislav Petkov Subject: Re: [patch 3/6] Cleanup efi_enter_virtual_mode function Message-ID: <20131028145801.GM4314@pd.tnic> References: <20131027034713.481920209@dhcp-16-126.nay.redhat.com> <20131027035923.081819853@dhcp-16-126.nay.redhat.com> <20131028093206.GB4314@pd.tnic> <20131028094049.GC25527@dhcp-16-126.nay.redhat.com> <20131028095117.GD25527@dhcp-16-126.nay.redhat.com> <20131028100402.GC4314@pd.tnic> <20131028101011.GF25527@dhcp-16-126.nay.redhat.com> <20131028112045.GH4314@pd.tnic> <20131028112458.GD29133@dhcp-16-126.nay.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20131028112458.GD29133@dhcp-16-126.nay.redhat.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: Dave Young Cc: mjg59@srcf.ucam.org, linux-efi@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, James.Bottomley@HansenPartnership.com, horms@verge.net.au, kexec@lists.fedoraproject.org, ebiederm@xmission.com, hpa@zytor.com, vgoyal@redhat.com 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! 3. Then I merged the 'efi' branch of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git ontop. It gave a simple merge conflict which is trivial to resolve: http://paste.debian.net/62579/ Here I started applying your patches and the 3rd one still fails. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec