From: Stefano Stabellini <stefano.stabellini@eu•citrix.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
Jan Beulich <JBeulich@suse•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Stefano Stabellini <Stefano.Stabellini@eu•citrix.com>
Subject: Re: linux-next: manual merge of the xen-two tree with Linus' tree
Date: Tue, 2 Oct 2012 11:44:14 +0100 [thread overview]
Message-ID: <alpine.DEB.2.02.1210021141370.29232@kaball.uk.xensource.com> (raw)
In-Reply-To: <20121002141949.f6e61437bdce0d56d9d4321e@canb.auug.org.au>
On Tue, 2 Oct 2012, Stephen Rothwell wrote:
> Hi Konrad,
>
> Today's linux-next merge of the xen-two tree got a conflict in
> drivers/xen/Makefile between commit 9fa5780beea1 ("USB EHCI/Xen:
> propagate controller reset information to hypervisor") from Linus' tree
> and commit 13febc84849d ("xen: do not compile manage, balloon, pci, acpi,
> pcpu and cpu_hotplug on ARM") from the xen-two tree.
>
> I fixed it up (I am not sure exactly what it should depend on - see
> below) and can carry the fix as necessary (no action is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc drivers/xen/Makefile
> index a4a3cab,cd28aae..0000000
> --- a/drivers/xen/Makefile
> +++ b/drivers/xen/Makefile
> @@@ -4,8 -8,11 +8,12 @@@ obj-y += xenbus
> nostackp := $(call cc-option, -fno-stack-protector)
> CFLAGS_features.o := $(nostackp)
>
> + obj-$(CONFIG_XEN_DOM0) += $(dom0-y)
> + dom0-$(CONFIG_PCI) += pci.o
> ++dom0-$(CONFIG_X86) += dbgp.o
> + dom0-$(CONFIG_ACPI) += acpi.o
> + dom0-$(CONFIG_X86) += pcpu.o
> obj-$(CONFIG_BLOCK) += biomerge.o
> - obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
> obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
> obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o
> obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o
Considering that dbgp doesn't seem to be very useful without PCI at the
moment, could we just turn it into:
dom0-$(CONFIG_PCI) += dbgp.o
?
next prev parent reply other threads:[~2012-10-02 10:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 4:19 linux-next: manual merge of the xen-two tree with Linus' tree Stephen Rothwell
2012-10-02 10:44 ` Stefano Stabellini [this message]
2012-10-02 11:37 ` Jan Beulich
2012-10-02 11:45 ` Stefano Stabellini
2012-10-02 11:54 ` Jan Beulich
2012-10-02 12:55 ` Konrad Rzeszutek Wilk
2012-10-02 13:33 ` Jan Beulich
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.1210021141370.29232@kaball.uk.xensource.com \
--to=stefano.stabellini@eu$(echo .)citrix.com \
--cc=JBeulich@suse$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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