On Tue, Mar 13, 2012 at 07:16:22AM +0100, Ingo Molnar wrote: > > * Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxx> To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Cc: Ingo Molnar <mingo@xxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Russell King <linux@xxxxxxxxxxxxxxxx> 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@xxxxxxx> To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Cc: Russell King <linux@xxxxxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Catalin Marinas <catalin.marinas@xxxxxxx>, Frank Rowand <frank.rowand@xxxxxxxxxxx> 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@xxxxxxx> To: linux-kernel@xxxxxxxxxxxxxxx, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: Russell King <linux@xxxxxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Will Deacon <will.deacon@xxxxxxx>, Frank Rowand <frank.rowand@xxxxxxxxxxx> 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: -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html