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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 Jul 2008 11:54:57 +1000

Hi all,

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
31656519e132f6612584815f128c83976a9aaaef ("sched, x86: clean up hrtick
implementation") from the sched tree.

The former removes _TIF_SINGLESTEP from _TIF_DO_NOTIFY_MASK, the latter
removes _TIF_HRTICK_RESCHED.  I removed both.  Worth a look when the tree
gets published.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/