From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752019AbaAXRIU (ORCPT <rfc822;w@1wt.eu>);
	Fri, 24 Jan 2014 12:08:20 -0500
Received: from merlin.infradead.org ([205.233.59.134]:45065 "EHLO
	merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751087AbaAXRIS (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 24 Jan 2014 12:08:18 -0500
Date: Fri, 24 Jan 2014 18:07:27 +0100
From: Peter Zijlstra <peterz@infradead.org>
To: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>, Andrew Morton <akpm@linux-foundation.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        "Paul E.McKenney" <paulmck@linux.vnet.ibm.com>,
        Will Deacon <will.deacon@arm.com>, linux-kernel@vger.kernel.org,
        linux-mm <linux-mm@kvack.org>, linux-arch@vger.kernel.org,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Waiman Long <waiman.long@hp.com>,
        Andrea Arcangeli <aarcange@redhat.com>, Alex Shi <alex.shi@linaro.org>,
        Andi Kleen <andi@firstfloor.org>,
        Michel Lespinasse <walken@google.com>,
        Davidlohr Bueso <davidlohr.bueso@hp.com>,
        Matthew R Wilcox <matthew.r.wilcox@intel.com>,
        Dave Hansen <dave.hansen@intel.com>, Rik van Riel <riel@redhat.com>,
        Peter Hurley <peter@hurleysoftware.com>,
        Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>,
        George Spelvin <linux@horizon.com>, "H. Peter Anvin" <hpa@zytor.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Aswin Chandramouleeswaran <aswin@hp.com>,
        Scott J Norton <scott.norton@hp.com>,
        "Figo.zhang" <figo1802@gmail.com>
Subject: Re: [PATCH v9 6/6] MCS Lock: Allow architecture specific asm files
 to be used for contended case
Message-ID: <20140124170727.GG31570@twins.programming.kicks-ass.net>
References: <cover.1390320729.git.tim.c.chen@linux.intel.com>
 <1390347382.3138.67.camel@schen9-DESK>
 <20140122183539.GM30183@twins.programming.kicks-ass.net>
 <1390583029.3138.78.camel@schen9-DESK>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1390583029.3138.78.camel@schen9-DESK>
User-Agent: Mutt/1.5.21 (2012-12-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Jan 24, 2014 at 09:03:49AM -0800, Tim Chen wrote:
> On Wed, 2014-01-22 at 19:35 +0100, Peter Zijlstra wrote:
> > On Tue, Jan 21, 2014 at 03:36:22PM -0800, Tim Chen wrote:
> > > diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
> > > index 8b19a80..24027ce 100644
> > > --- a/arch/powerpc/include/asm/Kbuild
> > > +++ b/arch/powerpc/include/asm/Kbuild
> > > @@ -1,6 +1,8 @@
> > >  
> > > +generic-y += +=
> > >  generic-y += clkdev.h
> > > +generic-y += mcs_spinlock.h
> > >  generic-y += preempt.h
> > >  generic-y += rwsem.h
> > >  generic-y += trace_clock.h
> > > -generic-y += vtime.h
> > > +generic-y += vtime.hgeneric-y
> > 
> > Something went funny there, fixed it.
> 
> Thanks for fixing it.  I assume Peter you have picked up
> the patch series and merged them?

I have picked up, Ingo generally doesn't merge new patches until after
-rc1 closes though, with the obvious exception to 'urgent' patches that
fix problems stemming from the merge window.