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

From: Jeremy Fitzhardinge <[email-masked]>
Date: Mon, 07 Jul 2008 20:22:10 -0700

Stephen Rothwell wrote:
> 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.
>   

I must be missing something.  Don't all those already come from tip.git 
pre-merged?  Or are you merging various tip.git topic branches 
yourself?  Or are some of these coming from elsewhere?

> Just contextual remove/move of code.  I can carry the fixup.
>   

Thanks,
    J