mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	<xen-devel@lists.xensource.com>, <linux-kernel@vger.kernel.org>,
	Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>,
	<JBeulich@suse.com>
Subject: Re: [PATCH] xen/Makefile: resolve merge conflict with 9fa5780beea1
Date: Wed, 3 Oct 2012 01:21:59 +1000	[thread overview]
Message-ID: <20121003012159.029e5282fa108697eaa3a9ff@canb.auug.org.au> (raw)
In-Reply-To: <alpine.DEB.2.02.1210021606000.29232@kaball.uk.xensource.com>

[-- Attachment #1: Type: text/plain, Size: 993 bytes --]

Hi,

On Tue, 2 Oct 2012 16:13:15 +0100 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.
> 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
> 
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

I'll use this resolution if it is needed tomorrow.  Assuming that the
other build problem with the xen-two tree is fixed, of course.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2012-10-02 15:22 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 [this message]
2012-10-02 15:25 ` Jan Beulich
2012-10-02 15:30   ` Stefano Stabellini

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=20121003012159.029e5282fa108697eaa3a9ff@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=JBeulich@suse.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --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®