* Borislav Petkov <[email protected]> wrote:
> On Fri, Jan 25, 2013 at 10:20:32AM +0100, Ingo Molnar wrote:
> > Maybe it's related, but I had to resolve two conflicts when
> > merging your two patches to tip:x86/cpu and then to
> > tip:master - first in arch/x86/Kconfig, then in
> > arch/x86/include/asm/hypervisor.h.
> >
> > The second conflict looked harmless, due to:
> >
> > 4cca6ea04d31 x86/apic: Allow x2apic without IR on VMware platform
>
> Ok, I've triggered it here with one of my 64-bit randconfigs
> and have a fix already. Tell me against which branch you want
> the patches done and I'll prep them so - currently I'm doing
> them ontop of rc4+ and tip/master from yesterday.
That's ok. I'll apply them to tip:x86/cpu and then resolve the
conflicts against tip:master.
Thanks,
Ingo
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
