Subject: Re: linux-next: manual merge of the sched tree

From: Ingo Molnar <[email-masked]>
Date: Wed, 19 Nov 2008 09:45:53 +0100

* Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> Today's linux-next merge of the sched tree got a conflict in 
> kernel/Makefile between commit 
> 65ecc14a30ad21bed9aabdfd6a2ae1a1aaaa6a00 ("Remove -mno-spe flags as 
> they dont belong") from Linus' tree and commit 
> 8bb8c4386d08f2cc5d871d22f220d35032213f84 ("sched, ftrace: trace 
> sched.c") from the sched tree.
> 
> I fixed it up (see below) and can carry it for a short while.

i did a similar conflict resolution yesterday. I have pushed out a new 
tip/auto-sched-next branch - you should not see this conflict in the 
future.

Thanks,

	Ingo