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

From: Ingo Molnar <[email-masked]>
Date: Tue, 22 Jul 2008 11:13:26 +0200

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

> Hi all,
> 
> On Tue, 22 Jul 2008 11:54:57 +1000 Stephen Rothwell <[email-masked]> wrote:
> >
> > Today's linux-next merge of the sched tree got a conflict in
> > include/asm-x86/thread_info.h between commit
> > 64f097331928b01d704047c1dbc738bb6d2a9bf9 ("x86 ptrace: unify
> > TIF_SINGLESTEP") from the  tree and commit
>                         ^^^^
> Linus'

thanks Stephen - i too had a resolution for this, pushed it out into 
auto-sched-next so the linux-next conflict should go away on your next 
iteration.

	Ingo