From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"JBeulich@suse.com" <JBeulich@suse.com>
Subject: Re: [PATCH v2] xen/Makefile: resolve merge conflict with 9fa5780beea1
Date: Tue, 2 Oct 2012 12:43:33 -0400 [thread overview]
Message-ID: <20121002164333.GA28626@phenom.dumpdata.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1210021737000.29232@kaball.uk.xensource.com>
On Tue, Oct 02, 2012 at 05:45:17PM +0100, Stefano Stabellini 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_SUPPORT is defined.
> After all xen_dbgp_op relies on hcd_to_bus.
>
> This patch should be applied on top of
>
> http://marc.info/?l=linux-kernel&m=134919011231980&w=2
OK. I have that in my tree (along with the other patch you posted)
so I think we are all set for this issue.
prev parent reply other threads:[~2012-10-02 16:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 16:45 [PATCH v2] xen/Makefile: resolve merge conflict with 9fa5780beea1 Stefano Stabellini
2012-10-02 16:43 ` Konrad Rzeszutek Wilk [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=20121002164333.GA28626@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=JBeulich@suse.com \
--cc=Stefano.Stabellini@eu.citrix.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.