Messages in this thread | | | Date | Fri, 31 Dec 2010 12:17:12 +0100 | From | Tejun Heo <> | Subject | Re: linux-next: manual merge of the percpu tree with the tip tree |
| |
On Fri, Dec 31, 2010 at 01:55:46PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the percpu tree got a conflict in > arch/x86/kernel/apic/x2apic_uv_x.c between commit > d8850ba425d9823d3184bd52f065899dac4689f9 ("x86, UV: Fix the effect of > extra bits in the hub nodeid register") from the tip tree and commit > 0a3aee0da4402aa19b66e458038533c896fb80c6 ("x86: Use this_cpu_ops to > optimize code") from the percpu tree. > > I fixed it up (see below) and can carry the fix as necessary.
Thank you. Looks good to me.
-- tejun
| |