Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932526Ab3D3O6P (ORCPT ); Tue, 30 Apr 2013 10:58:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56618 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932363Ab3D3O6O (ORCPT ); Tue, 30 Apr 2013 10:58:14 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <517FB0F6.9030103@console-pimps.org> References: <20130429181819.GA2254@console-pimps.org> <20130430084731.GB21473@gmail.com> <517FB0F6.9030103@console-pimps.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [GIT PULL] EFI merge botch fix From: "H. Peter Anvin" Date: Tue, 30 Apr 2013 07:57:32 -0700 To: Matt Fleming , Ingo Molnar CC: Tony Luck , Matthew Garrett , Thomas Gleixner , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <7b4ef246-c442-45e6-bc1e-0e1821f8fad9@email.android.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1747 Lines: 48 Yes, please send pull requests. Matt Fleming wrote: >On 30/04/13 09:47, Ingo Molnar wrote: >> The other problem is that tip:x86/efi also conflicts with current >-git, as >> of v3.9 - due to interaction with an EFI fix tree ... >> >> This is getting ugly pretty fast, so I'd suggest to re-do the merges >> cleanly, not by rebasing the tree, but by redoing the first merge in >> essence: >> >> e29c2de5f591 Merge tag 'v3.9-rc8' into efi-for-tip >> >> By correctly merging v3.9-final into f53f292 - making sure the >changes to >> drivers/firmware/efivars.c correctly merge over, and making sure the >ia64 >> select does not get lost. >> >> Something like this would do: >> >> git checkout -b x86-new-efi-branch f53f292 >> git merge v3.9 >> < ... resolve all the conflicts ...> >> git commit >> >> I can then (non-fast-forward) fetch this new EFI branch as the new >> tip:x86/efi. > >OK, I re-did the merge against v3.9 as requested and published it as >'efi-for-tip2'. Would you like me to send a proper pull request if >that's easier to pull into the tip machinery? > >I have also started accumulating fixes against the EFI changes in >tip/x86/efi. Would you like those as a separate pull request? The fixes >branch is 'efi-for-tip-fixes' and is based on the above merge branch, >'efi-for-tip2'. It mainly includes fixes for bugs in the pstore paths >which Seiji Aguchi found. -- Sent from my mobile phone. Please excuse brevity and lack of formatting. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/