From mboxrd@z Thu Jan 1 00:00:00 1970 From: "H. Peter Anvin" Subject: Re: [PATCH v2 00/10] arm64: UEFI support Date: Tue, 29 Apr 2014 07:38:33 -0700 Message-ID: <535FB969.5080503@zytor.com> References: <1398442154-19974-1-git-send-email-leif.lindholm@linaro.org> <20140429102817.GE17007@arm.com> <20140429114356.GK26088@console-pimps.org> <20140429134726.GH17007@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140429134726.GH17007-5wv7dgnIgG8@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Catalin Marinas , Matt Fleming Cc: Leif Lindholm , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org" , "grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" , "roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" , "ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" , Mark Rutland , "linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Stephen Rothwell , Linus Torvalds List-Id: linux-efi@vger.kernel.org On 04/29/2014 06:47 AM, Catalin Marinas wrote: > > Waiting for the tip/x86/efi to be merged first is not a problem. We > also need a stable base for testing the arm64 UEFI series, so I assume > this series can be based onto tip/x86/efi (would such branch be rebased > before hitting mainline?). > > Given that Leif's series contains both generic efi and arm64 patches, > what's your preference for merging them? I'm happy to add my ack and > they go via your tree (or the other way around). > tip:x86/efi will not be rebased (barring major unforseen events). I'm not opposed to pushing the arm64 patches through -tip (via Matt), if it works with your workflow, either. Perhaps we need to rename the branch to tip:core/efi... -hpa