Messages in this thread | | | Date | Tue, 13 Mar 2012 08:33:10 +0000 | From | Russell King <> | Subject | Re: linux-next: manual merge of the arm tree with Linus' tree |
| |
On Tue, Mar 13, 2012 at 07:16:22AM +0100, Ingo Molnar wrote: > > * Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > Hi Russell, > > > > Today's linux-next merge of the arm tree got a conflict in > > kernel/sched/core.c between commit 8c79a045fd59 ("sched/events: Revert > > trace_sched_stat_sleeptime()") from Linus' tree and commit 1cf00341547a > > ("sched: Introduce the finish_arch_post_lock_switch() scheduler hook") > > from the arm tree. > > > > Just context changes. I fixed it up (see below) and can carry the fix as > > necessary. > > This commit seems simple enough and has PeterZ's ack, but if > there are more scheduler patches coming in this area then please > send it to the scheduler tree first: we can create a pullable, > stable topic branch for it which the ARM tree can then use. > > That approach would also avoid conflicts as a side effect.
Please check your mailbox:
Date: Tue, 29 Nov 2011 12:22:27 +0000 From: Catalin Marinas <catalin.marinas@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>, Russell King <linux@arm.linux.org.uk> Subject: [RFC PATCH 1/6] sched: Introduce the finish_arch_post_lock_switch() scheduler hook
Date: Mon, 19 Dec 2011 14:57:48 +0000 From: Catalin Marinas <catalin.marinas@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Russell King <linux@arm.linux.org.uk>, Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>, Catalin Marinas <catalin.marinas@arm.com>, Frank Rowand <frank.rowand@am.sony.com> Subject: [RFC PATCH v2 1/6] sched: Introduce the finish_arch_post_lock_switch() scheduler hook
Date: Fri, 20 Jan 2012 17:42:27 +0000 From: Catalin Marinas <catalin.marinas@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Russell King <linux@arm.linux.org.uk>, Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>, Will Deacon <will.deacon@arm.com>, Frank Rowand <frank.rowand@am.sony.com> Subject: [PATCH v3 1/6] sched: Introduce the finish_arch_post_lock_switch() scheduler hook
-- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
| |