From: Ingo Molnar <mingo@kernel.org>
To: Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>,
X86 ML <x86@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
LKML <linux-kernel@vger.kernel.org>,
devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com,
jasowang@redhat.com, Thomas Gleixner <tglx@linutronix.de>,
JBeulich@suse.com, Borislav Petkov <bp@suse.de>
Subject: Re: [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu
Date: Fri, 25 Jan 2013 10:32:41 +0100 [thread overview]
Message-ID: <20130125093241.GA19717@gmail.com> (raw)
In-Reply-To: <20130125092915.GB23404@pd.tnic>
* Borislav Petkov <bp@alien8.de> 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
next prev parent reply other threads:[~2013-01-25 9:32 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 1:56 [PATCH RESEND 1/1] X86: Handle Hyper-V vmbus interrupts as special hypervisor interrupts K. Y. Srinivasan
2013-01-24 9:28 ` Borislav Petkov
2013-01-24 12:11 ` H. Peter Anvin
2013-01-24 17:35 ` Borislav Petkov
2013-01-24 17:36 ` H. Peter Anvin
2013-01-24 17:39 ` [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu Borislav Petkov
2013-01-24 17:39 ` [PATCH 2/2] x86: Make Linux guest support optional Borislav Petkov
2013-01-25 8:21 ` [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu Ingo Molnar
2013-01-25 8:51 ` Borislav Petkov
2013-01-25 9:20 ` Ingo Molnar
2013-01-25 9:29 ` Borislav Petkov
2013-01-25 9:32 ` Ingo Molnar [this message]
2013-01-25 10:06 ` Borislav Petkov
2013-01-25 17:59 ` [PATCH -v2 " Borislav Petkov
2013-01-25 17:59 ` [PATCH -v2 2/2] x86: Make Linux guest support optional Borislav Petkov
2013-01-25 18:07 ` Dmitry Torokhov
2013-01-25 18:23 ` Borislav Petkov
2013-01-25 18:29 ` Dmitry Torokhov
2013-01-25 18:35 ` Borislav Petkov
2013-01-25 18:43 ` Borislav Petkov
2013-01-27 1:26 ` H. Peter Anvin
2013-01-27 10:30 ` Borislav Petkov
2013-01-25 18:12 ` Dmitry Torokhov
2013-01-25 18:32 ` Borislav Petkov
2013-01-25 18:42 ` Dmitry Torokhov
2013-01-25 19:03 ` Borislav Petkov
2013-01-26 23:10 ` [PATCH -v3 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu Borislav Petkov
2013-01-26 23:10 ` [PATCH -v3 2/2] x86: Make Linux guest support optional Borislav Petkov
2013-01-27 11:06 ` Borislav Petkov
2013-01-28 10:18 ` [PATCH -v3.1] " Borislav Petkov
2013-01-24 17:42 ` [PATCH RESEND 1/1] X86: Handle Hyper-V vmbus interrupts as special hypervisor interrupts KY Srinivasan
2013-02-14 19:28 [PATCH 0/2] x86: Make Linux guest support optional Borislav Petkov
2013-02-14 19:28 ` [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu Borislav Petkov
2013-03-04 20:20 [PATCH 0/2] x86: Make Linux guest support optional Borislav Petkov
2013-03-04 20:20 ` [PATCH 1/2] x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130125093241.GA19717@gmail.com \
--to=mingo@kernel.org \
--cc=JBeulich@suse.com \
--cc=apw@canonical.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).