From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: Re: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Date: Mon, 23 Sep 2013 22:05:05 +0100 Message-ID: <20130923210505.GI19043@lvm> References: <1378938461-10835-1-git-send-email-olof@lixom.net> <20130912015002.GO9860@cbox> <20130923203042.GY12758@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Olof Johansson , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.cs.columbia.edu" , "kvm@vger.kernel.org" , Ian Campbell To: Russell King - ARM Linux Return-path: Received: from mail-pb0-f42.google.com ([209.85.160.42]:44029 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752125Ab3IWVFS (ORCPT ); Mon, 23 Sep 2013 17:05:18 -0400 Received: by mail-pb0-f42.google.com with SMTP id un15so3694199pbc.15 for ; Mon, 23 Sep 2013 14:05:17 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130923203042.GY12758@n2100.arm.linux.org.uk> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, Sep 23, 2013 at 09:30:42PM +0100, Russell King - ARM Linux wrote: > On Mon, Sep 23, 2013 at 12:59:44PM -0700, Olof Johansson wrote: > > Hi Christoffer, > > > > On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall > > wrote: > > > On 16 September 2013 19:41, Olof Johansson wrote: > > >> Hi, > > >> > > >> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall > > >> wrote: > > >>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote: > > >>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson wrote: > > >>>> > cpu_reset is already #defined in as processor.reset, > > >>>> > so it expands here and causes problems. > > >>>> > > > >>>> > Signed-off-by: Olof Johansson > > >>>> > > >>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add: > > >>>> > > >>>> Cc: # 3.10+ > > >>>> > > >>> Thanks for the fix, applied. > > >> > > >> I haven't seen this hit linux-next yet? > > >> > > > I was waiting for kvm/next to move to 3.12-rc1 and base the patch for > > > kvm-arm-next off there, but I pushed this to kvm-arm-next now and it > > > should land in linux-next as soon as they update. > > > > Another week has passed, and -next and mainline are both still broken. > > Can we please see a fix in mainline and -next within the next few > > days? > > I'm getting failing builds too, which will only stop once it hits > mainline. Apologies about this, apparently linux-next doesn't pull in my tree despite e-mail confirmation that it did. I was away last week for LPC, but I'll make sure this lands upstream ASAP. -Christoffer