[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130125092915.GB23404@pd.tnic>
Date: Fri, 25 Jan 2013 10:29:15 +0100
From: Borislav Petkov <bp@...en8.de>
To: Ingo Molnar <mingo@...nel.org>
Cc: "H. Peter Anvin" <hpa@...or.com>, X86 ML <x86@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
LKML <linux-kernel@...r.kernel.org>,
devel@...uxdriverproject.org, olaf@...fle.de, apw@...onical.com,
jasowang@...hat.com, Thomas Gleixner <tglx@...utronix.de>,
JBeulich@...e.com, Borislav Petkov <bp@...e.de>
Subject: Re: [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt
menu
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.
Thanks.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists