From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AB892B700C for ; Sat, 14 Apr 2012 01:29:39 +1000 (EST) Subject: Re: [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table Mime-Version: 1.0 (Apple Message framework v1257) Content-Type: text/plain; charset=us-ascii From: Kumar Gala In-Reply-To: <20120411202752.GA12204@schlenkerla.am.freescale.net> Date: Fri, 13 Apr 2012 10:29:31 -0500 Message-Id: <2FE08B3F-BC40-4003-84E8-CBF38A8BEB66@kernel.crashing.org> References: <20120411202752.GA12204@schlenkerla.am.freescale.net> To: Scott Wood Cc: Marcelo Tosatti , linuxppc-dev@lists.ozlabs.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Apr 11, 2012, at 3:27 PM, Scott Wood wrote: > e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, > "powerpc: Add initial e6500 cpu support" and the introduction of > CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68, > "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU > table entry missing CPU_FTR_EMB_HV. > > Signed-off-by: Scott Wood > --- > Fixup patch for the KVM merge as requested by Marcelo. > > arch/powerpc/include/asm/cputable.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Acked-by: Kumar Gala - k