From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Fleming Subject: Re: [PATCH 0/4] x86/efi: Minor cleanup patches Date: Tue, 9 Sep 2014 08:27:16 +0100 Message-ID: <20140909072716.GF18582@console-pimps.org> References: <1410111737-5220-1-git-send-email-minipli@googlemail.com> <20140908194105.GA18582@console-pimps.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Mathias Krause Cc: Matt Fleming , linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-efi@vger.kernel.org On Tue, 09 Sep, at 09:03:31AM, Mathias Krause wrote: > On 8 September 2014 21:41, Matt Fleming wrote: > > > > Since they don't apply to the 'next' branch (queue for v3.18) and since > > they're cleanups with minimal risk, I've applied them to the 'urgent' > > branch. > > Sorry, I should have checked that! I can send a rebased version if you > want me to. Nah, don't worry. I usually prefer that people base their patches on Linus' tree and an -rc or final v3.x tag. I got some pushback from the tip folks on including these patches in an urgent pull request because they're not regression fixes. What I've now done is stuck them on the queue for v3.18 in 'next'. Everything applied cleanly apart from "x86/efi: Unexport add_efi_memmap variable", because of recent changes to move the "noefi" handling code out of arch/x86. I fixed up the conflict, but please take a look at the 'next' branch and see whether your rebased patches look correct. -- Matt Fleming, Intel Open Source Technology Center