lkml.org 
[lkml]   [2008]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86: APIC: Remove apic_write_around(); use alternatives

* Suresh Siddha <suresh.b.siddha@intel.com> wrote:

> On Fri, Jul 18, 2008 at 02:03:48PM -0700, Ingo Molnar wrote:
> >
> > * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> >
> > > > git merge tip/x86/x2apic
> > > CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
> > > CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
> > > CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
> > > CONFLICT (content): Merge conflict in arch/x86/kernel/vmi_32.c
> > > CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
> > > CONFLICT (content): Merge conflict in include/asm-x86/apic.h
> > > CONFLICT (content): Merge conflict in include/asm-x86/paravirt.h
> >
> > that's due to the changes in tip/x86/apic and in tip/x86/uv.
> >
> > ok, i've just merged x86/apic into x86/x2apic and x86/uv as well, and
> > pushed out the result.
> >
> > Note: it's a first raw merge and completely untested. It will now merge
> > cleanly into tip/master. There are probably a few details missing.
>
> Ingo, thanks for doing this. While I was testing my merge changes, you
> posted yours... anyhow we need this piece, which is missing from your
> merge.

thanks, applied and pushed out. Could you check whether the latest
tip/x86/x2apic code, when git-merge-ed into tip/master, is sane on your
box(en)?

Ingo


\
 
 \ /
  Last update: 2008-07-19 23:51    [W:0.074 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site