Messages in this thread | | | Date | Sat, 19 Jul 2008 23:53:25 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH] x86: APIC: Remove apic_write_around(); use alternatives |
| |
* Ingo Molnar <mingo@elte.hu> wrote:
> > > maciej, patch will go first, and x2apic will goes later, so bisect > > > on x2apic will be broken. > > > > hm, ok. Ingo? should I send the rebased 30 or so patches. or we can > > move this patch later. > > hm, yes, please send the rebased patches - as this stuff has some > risks so bisectability is important.
hm, actually - the order is correct so no need to rebase any of this.
We've got two topics: tip/x86/apic and tip/x86/x2apic.
both tip/x86/x2apic and tip/x86/apic were OK standalone. I merged them together in this commit:
commit 453c1404c5273a30d715e5a83372a78cff70b6d9 Merge: a208f37... 35b6805... Author: Ingo Molnar <mingo@elte.hu> Date: Fri Jul 18 23:00:05 2008 +0200
Merge branch 'x86/apic' into x86/x2apic
Conflicts:
arch/x86/kernel/paravirt.c arch/x86/kernel/smpboot.c arch/x86/kernel/vmi_32.c arch/x86/lguest/boot.c arch/x86/xen/enlighten.c include/asm-x86/apic.h include/asm-x86/paravirt.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
and that didnt work straight away, so i applied your fixups - but that's the next commit. So there's only a single commit that is not bisectable and that's OK.
so unless there's some other breakage i missed, this should be fine and no need to resend/rebase anything.
Ingo
| |