Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801AbcD2Kq3 (ORCPT ); Fri, 29 Apr 2016 06:46:29 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35207 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752177AbcD2Kq0 (ORCPT ); Fri, 29 Apr 2016 06:46:26 -0400 Date: Fri, 29 Apr 2016 12:46:21 +0200 From: Ingo Molnar To: Stefano Stabellini Cc: Stephen Rothwell , "Luis R. Rodriguez" , Matt Fleming , Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shannon Zhao , Ard Biesheuvel , Borislav Petkov Subject: Re: efi_enabled(EFI_PARAVIRT) use Message-ID: <20160429104621.GA6354@gmail.com> References: <20160429142020.4499e185@canb.auug.org.au> <20160429063936.GA28320@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 681 Lines: 20 * Stefano Stabellini wrote: > On Fri, 29 Apr 2016, Ingo Molnar wrote: > > Also, it would be nice to have all things EFI in a single tree, the conflicts are > > going to be painful! There's very little reason not to carry this kind of commit: > > > > arch/arm/xen/enlighten.c | 6 +++++ > > drivers/firmware/efi/arm-runtime.c | 17 +++++++++----- > > drivers/firmware/efi/efi.c | 45 ++++++++++++++++++++++++++++++++------ > > 3 files changed, 56 insertions(+), 12 deletions(-) > > > > in the EFI tree. > > That's true. I'll drop this commit from xentip and let Matt pick it up > or request changes as he sees fit. Thanks! Ingo