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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 8 Jul 2008 10:56:58 +1000

Hi all,

Today's linux-next merge of the x86 tree got a conflict in
include/asm-x86/irqflags.h between commit
81d68a96a39844853b37f20cc8282d9b65b78ef3 ("ftrace: trace irq disabled
critical timings") from the ftrace tree and commits
f56c208ae2a6705a40c0f7d43bfc4ede7eb20a83 ("x86, 64-bit: swapgs pvop with
a user-stack can never be called") and
6d2a6e57be1582b017a39f52385adf49d7cc4b0f ("x86_64: fix non-paravirt
compilation") from the x86 tree.

Just contextual remove/move of code.  I can carry the fixup.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/