From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Jan Beulich <JBeulich@suse.com>
Cc: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
"sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1
Date: Tue, 2 Oct 2012 16:30:06 +0100 [thread overview]
Message-ID: <alpine.DEB.2.02.1210021629440.29232@kaball.uk.xensource.com> (raw)
In-Reply-To: <506B236C020000780009F281@nat28.tlf.novell.com>
On Tue, 2 Oct 2012, Jan Beulich wrote:
> >>> On 02.10.12 at 17:13, Stefano Stabellini <stefano.stabellini@eu.citrix.com> wrote:
> > This patch is actually a merge conflict resolution between Konrad's Xen
> > tree and the following commit:
> >
> > commit 9fa5780beea1274d498a224822397100022da7d4
> > Author: Jan Beulich <JBeulich@suse.com>
> > Date: Tue Sep 18 12:23:02 2012 +0100
> >
> > USB EHCI/Xen: propagate controller reset information to hypervisor
> >
> >
> > Compile dbgp.o only if CONFIG_USB is defined.
>
> Now this is wrong: USB is a tristate config option, yet dbgp.o
> must be built in. This is why I suggested to use USB_SUPPORT
> (if anything at all).
I see. You are right. I'll re-send the patch.
prev parent reply other threads:[~2012-10-02 15:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 15:13 Stefano Stabellini
2012-10-02 15:21 ` Stephen Rothwell
2012-10-02 15:25 ` Jan Beulich
2012-10-02 15:30 ` Stefano Stabellini [this message]
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=alpine.DEB.2.02.1210021629440.29232@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=JBeulich@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=xen-devel@lists.xensource.com \
/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
all inboxes | Powered by JetHome®