From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754947Ab3AYJ02 (ORCPT ); Fri, 25 Jan 2013 04:26:28 -0500 Received: from mail.skyhub.de ([78.46.96.112]:48530 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753306Ab3AYJ00 (ORCPT ); Fri, 25 Jan 2013 04:26:26 -0500 Date: Fri, 25 Jan 2013 10:29:15 +0100 From: Borislav Petkov To: Ingo Molnar Cc: "H. Peter Anvin" , X86 ML , Greg Kroah-Hartman , LKML , devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, jasowang@redhat.com, Thomas Gleixner , JBeulich@suse.com, Borislav Petkov Subject: Re: [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu Message-ID: <20130125092915.GB23404@pd.tnic> Mail-Followup-To: Borislav Petkov , Ingo Molnar , "H. Peter Anvin" , X86 ML , Greg Kroah-Hartman , LKML , devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, jasowang@redhat.com, Thomas Gleixner , JBeulich@suse.com, Borislav Petkov References: <20130124173555.GJ13463@pd.tnic> <1359049194-17505-1-git-send-email-bp@alien8.de> <20130125082126.GD25314@gmail.com> <20130125085146.GA23404@pd.tnic> <20130125092032.GC31478@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20130125092032.GC31478@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. --