Re: linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-02 Thread Jan Beulich
>>> On 02.10.12 at 14:55, Konrad Rzeszutek Wilk wrote: > On Tue, Oct 02, 2012 at 12:54:20PM +0100, Jan Beulich wrote: >> >>> On 02.10.12 at 13:45, Stefano Stabellini >> >>> > wrote: >> >> > Considering that dbgp doesn't seem to be very useful without PCI at the >> >> > moment, could we just tur

Re: linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-02 Thread Konrad Rzeszutek Wilk
On Tue, Oct 02, 2012 at 12:54:20PM +0100, Jan Beulich wrote: > >>> On 02.10.12 at 13:45, Stefano Stabellini > >>> wrote: > >> > 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 > >> > >

Re: linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-02 Thread Jan Beulich
>>> On 02.10.12 at 13:45, Stefano Stabellini >>> wrote: >> > 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 >> > >> > ? >> >> Better not - the code is specifically not PCI-only. And I can't

Re: linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-02 Thread Stefano Stabellini
On Tue, 2 Oct 2012, Jan Beulich wrote: > >>> On 02.10.12 at 12:44, Stefano Stabellini > >>> wrote: > >> --- 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

Re: linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-02 Thread Jan Beulich
>>> On 02.10.12 at 12:44, Stefano Stabellini >>> wrote: >> --- 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-$(CO

Re: linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-02 Thread Stefano Stabellini
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:

linux-next: manual merge of the xen-two tree with Linus' tree

2012-10-01 Thread Stephen Rothwell
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_