* Yong Wang <yong.y.wang@linux.intel.com> wrote:

quoted text
> On Thu, Jul 10, 2008 at 09:53:20PM +0200, Ingo Molnar wrote:
> > 
> > quite some stuff!
> > 
> > For review and testing purposes i've created a new topic branch for 
> > this: tip/x86/x2apic and have picked up your patches into it.
> > 
> > I've pushed it out, but it's not merged into tip/master yet (obviously, 
> > you sent this just a few minutes ago :)
> > 
> > It integrates fine with tip/master. If you do this:
> > 
> >   git-checkout tip/master
> >   git-merge tip/x86/x2apic
> > 
> > you'll get a clean merge.
> > 
> 
> I'm seeing the following build error using default config.
> 
>   AS      arch/x86/lib/csum-copy_64.o
> arch/x86/lib/csum-copy_64.S: Assembler messages:
> arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined
> make[1]: *** [arch/x86/lib/csum-copy_64.o] Error 1
> make: *** [arch/x86/lib] Error 2
> make: *** Waiting for unfinished jobs....
> 
> Anyone encountered the same problem or any idea of what's wrong?

that should be fixed already.

What is the output of:

  git-log tip/master | head

? The latest should be:

  commit a328874646a654eabb67da88b3d0a606e552ffe7
  Merge: 760e48e... 9d3b08d...
  Author: Ingo Molnar <mingo@elte.hu>
  Date:   Tue Jul 15 17:16:40 2008 +0200

and there this error should not occur.

	Ingo
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/