Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933963AbaD2LoJ (ORCPT ); Tue, 29 Apr 2014 07:44:09 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:45302 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933516AbaD2LoG (ORCPT ); Tue, 29 Apr 2014 07:44:06 -0400 Date: Tue, 29 Apr 2014 12:43:56 +0100 From: Matt Fleming To: Catalin Marinas Cc: Leif Lindholm , "linux-kernel@vger.kernel.org" , "linux-efi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "msalter@redhat.com" , "grant.likely@linaro.org" , "roy.franz@linaro.org" , "ard.biesheuvel@linaro.org" , Mark Rutland , "linux-doc@vger.kernel.org" , "H. Peter Anvin" , Stephen Rothwell , Linus Torvalds Subject: Re: [PATCH v2 00/10] arm64: UEFI support Message-ID: <20140429114356.GK26088@console-pimps.org> References: <1398442154-19974-1-git-send-email-leif.lindholm@linaro.org> <20140429102817.GE17007@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140429102817.GE17007@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (Pulling in Peter and Stephen) On Tue, 29 Apr, at 11:28:17AM, Catalin Marinas wrote: > > The patches look fine to me, they've been through several rounds of > review already. How do we propose these get merged as the series > contains both generic and arm64 patches? And there are dependencies > already in linux-next. > > Are the EFI patches in -next pulled from some non-rebaseable branch? Peter suggsted a plan when he took the generic EFI stuff that's in tip (and hence currently in linux-next), It doesn't hurt to inform Stephen, although I think it will simply fall out automatically since he uses git to merge and git will recognize the graph. During the merge window, it means they should not push their patches until Linus has accepted the precondition patches from the tip tree. Since Ingo and I try to push most of the tip tree as early as possible in the merge window, this is usually not a problem. So we currently have the prerequisites in tip/x86/efi, and assuming that this 10-patch series gets merged into a single branch somewhere, things should work automatically for linux-next. It may be prudent to negotiate a plan now for when the merge window opens because, as Peter mentions above, the stuff in tip/x86/efi needs to be merged by Linus first to avoid build breakage with the arm64 stuff. -- Matt Fleming, Intel Open Source Technology Center -- 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/