From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761234Ab2C3RVz (ORCPT ); Fri, 30 Mar 2012 13:21:55 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:42512 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758946Ab2C3RVv (ORCPT ); Fri, 30 Mar 2012 13:21:51 -0400 Date: Fri, 30 Mar 2012 18:21:24 +0100 From: Catalin Marinas To: Ingo Molnar Cc: Ingo Molnar , Russell King , Linus Torvalds , Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Peter Zijlstra Subject: Re: [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback Message-ID: <20120330172124.GA28178@arm.com> References: <20120313101859.GA2626@elte.hu> <20120313112729.GA25835@flint.arm.linux.org.uk> <20120313115640.GA27378@elte.hu> <20120313121707.GA2174@flint.arm.linux.org.uk> <20120313124433.GA15333@elte.hu> <20120313130427.GC2174@flint.arm.linux.org.uk> <20120313133115.GA21634@elte.hu> <20120313154716.GA31293@elte.hu> <20120330135255.GC23295@arm.com> <20120330142544.GA13966@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120330142544.GA13966@gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 30, 2012 at 03:25:44PM +0100, Ingo Molnar wrote: > > * Catalin Marinas wrote: > > > Hi Ingo, > > > > On Tue, Mar 13, 2012 at 03:47:16PM +0000, Ingo Molnar wrote: > > > Anyway - regardless of any differences and flames about workflow > > > details, both you and Catalin should still feel free to use both > > > the original commit (1cf00341547a) or the tip:sched/arch branch > > > I provided (01f23e1630d9). > > > > About the scheduler hook patch, would it go into mainline via > > the sched/urgent or the sched/arch branch? I would like to > > rebase the ARM-specific patches on top of one of these > > branches and send you a pull request (with Russell's ack). > > I've merged it into sched/urgent yesterday, which I'll send to > Linus - so you can base it on that. Thanks. Russell, are you happy for me to add your acked-by to the ARM patches? -- Catalin