* linux-next: manual merge of the xen-two tree with Linus' tree
@ 2012-10-02 4:19 Stephen Rothwell
2012-10-02 10:44 ` Stefano Stabellini
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2012-10-02 4:19 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: linux-next, linux-kernel, Jan Beulich, Greg Kroah-Hartman,
Stefano Stabellini
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the xen-two tree with Linus' tree
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
2012-10-02 11:37 ` Jan Beulich
0 siblings, 1 reply; 7+ messages in thread
From: Stefano Stabellini @ 2012-10-02 10:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Konrad Rzeszutek Wilk, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Jan Beulich, Greg Kroah-Hartman,
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: 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
?
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the xen-two tree with Linus' tree
2012-10-02 10:44 ` Stefano Stabellini
@ 2012-10-02 11:37 ` Jan Beulich
2012-10-02 11:45 ` Stefano Stabellini
0 siblings, 1 reply; 7+ messages in thread
From: Jan Beulich @ 2012-10-02 11:37 UTC (permalink / raw)
To: Stephen Rothwell, Stefano Stabellini
Cc: Greg Kroah-Hartman, Konrad Rzeszutek Wilk,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
>>> On 02.10.12 at 12:44, Stefano Stabellini <stefano.stabellini@eu•citrix.com> 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-$(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
>
> ?
Better not - the code is specifically not PCI-only. And I can't see
how it would be harmful to be compiled on e.g. ARM (so the
merge perhaps really should use XEN_DOM0 alone, without
X86. If anything (and that may indeed be a minor oversight of
the original patch) one might want it to depend on USB_SUPPORT,
as without that no in-tree debug port capable driver would be
able to load (and hence interfere with Xen's use of the debug
port). However, as long as it builds fine with USB_SUPPORT
undefined (which I believe it does), having it in the shape it
is allows for out-of-tree drivers as well (as long as they make
use of the designated interface).
Jan
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the xen-two tree with Linus' tree
2012-10-02 11:37 ` Jan Beulich
@ 2012-10-02 11:45 ` Stefano Stabellini
2012-10-02 11:54 ` Jan Beulich
0 siblings, 1 reply; 7+ messages in thread
From: Stefano Stabellini @ 2012-10-02 11:45 UTC (permalink / raw)
To: Jan Beulich
Cc: Stephen Rothwell, Stefano Stabellini, Greg Kroah-Hartman,
Konrad Rzeszutek Wilk, linux-kernel@vger•kernel.org,
linux-next@vger•kernel.org
On Tue, 2 Oct 2012, Jan Beulich wrote:
> >>> On 02.10.12 at 12:44, Stefano Stabellini <stefano.stabellini@eu•citrix.com> 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-$(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
> >
> > ?
>
> Better not - the code is specifically not PCI-only. And I can't see
> how it would be harmful to be compiled on e.g. ARM (so the
> merge perhaps really should use XEN_DOM0 alone, without
> X86. If anything (and that may indeed be a minor oversight of
> the original patch) one might want it to depend on USB_SUPPORT,
> as without that no in-tree debug port capable driver would be
> able to load (and hence interfere with Xen's use of the debug
> port). However, as long as it builds fine with USB_SUPPORT
> undefined (which I believe it does), having it in the shape it
> is allows for out-of-tree drivers as well (as long as they make
> use of the designated interface).
OK for PCI.
Regarding USB_SUPPORT, considering that gbgp.c calls hcd_to_bus, I think
it would make sense to make it depend on it.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the xen-two tree with Linus' tree
2012-10-02 11:45 ` Stefano Stabellini
@ 2012-10-02 11:54 ` Jan Beulich
2012-10-02 12:55 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 7+ messages in thread
From: Jan Beulich @ 2012-10-02 11:54 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Stephen Rothwell, Greg Kroah-Hartman, Konrad Rzeszutek Wilk,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
>>> On 02.10.12 at 13:45, Stefano Stabellini <stefano.stabellini@eu•citrix.com> 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 see
>> how it would be harmful to be compiled on e.g. ARM (so the
>> merge perhaps really should use XEN_DOM0 alone, without
>> X86. If anything (and that may indeed be a minor oversight of
>> the original patch) one might want it to depend on USB_SUPPORT,
>> as without that no in-tree debug port capable driver would be
>> able to load (and hence interfere with Xen's use of the debug
>> port). However, as long as it builds fine with USB_SUPPORT
>> undefined (which I believe it does), having it in the shape it
>> is allows for out-of-tree drivers as well (as long as they make
>> use of the designated interface).
>
> OK for PCI.
> Regarding USB_SUPPORT, considering that gbgp.c calls hcd_to_bus, I think
> it would make sense to make it depend on it.
As said - I'd prefer to do that only if indeed needed to get things
to build without that option. Since include/usb/* doesn't reference
CONFIG_USB_SUPPORT, I'm in favor of supporting at least those
eventual out-of-tree drivers that do use the pre-existing data
structures (and others shouldn't be calling pre-existing APIs
anyway). But I wouldn't NAK a patch doing what you suggest
either.
Jan
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the xen-two tree with Linus' tree
2012-10-02 11:54 ` Jan Beulich
@ 2012-10-02 12:55 ` Konrad Rzeszutek Wilk
2012-10-02 13:33 ` Jan Beulich
0 siblings, 1 reply; 7+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-10-02 12:55 UTC (permalink / raw)
To: Jan Beulich
Cc: Stefano Stabellini, Stephen Rothwell, Greg Kroah-Hartman,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
On Tue, Oct 02, 2012 at 12:54:20PM +0100, Jan Beulich wrote:
> >>> On 02.10.12 at 13:45, Stefano Stabellini <stefano.stabellini@eu•citrix.com> 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 see
> >> how it would be harmful to be compiled on e.g. ARM (so the
> >> merge perhaps really should use XEN_DOM0 alone, without
> >> X86. If anything (and that may indeed be a minor oversight of
> >> the original patch) one might want it to depend on USB_SUPPORT,
> >> as without that no in-tree debug port capable driver would be
> >> able to load (and hence interfere with Xen's use of the debug
> >> port). However, as long as it builds fine with USB_SUPPORT
> >> undefined (which I believe it does), having it in the shape it
> >> is allows for out-of-tree drivers as well (as long as they make
> >> use of the designated interface).
> >
> > OK for PCI.
> > Regarding USB_SUPPORT, considering that gbgp.c calls hcd_to_bus, I think
> > it would make sense to make it depend on it.
>
> As said - I'd prefer to do that only if indeed needed to get things
> to build without that option. Since include/usb/* doesn't reference
> CONFIG_USB_SUPPORT, I'm in favor of supporting at least those
> eventual out-of-tree drivers that do use the pre-existing data
> structures (and others shouldn't be calling pre-existing APIs
> anyway). But I wouldn't NAK a patch doing what you suggest
> either.
Could it depend on EARLY_PRINTK_DBGP ?
>
> Jan
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the xen-two tree with Linus' tree
2012-10-02 12:55 ` Konrad Rzeszutek Wilk
@ 2012-10-02 13:33 ` Jan Beulich
0 siblings, 0 replies; 7+ messages in thread
From: Jan Beulich @ 2012-10-02 13:33 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Stephen Rothwell, Stefano Stabellini, Greg Kroah-Hartman,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
>>> On 02.10.12 at 14:55, Konrad Rzeszutek Wilk <konrad.wilk@oracle•com> wrote:
> On Tue, Oct 02, 2012 at 12:54:20PM +0100, Jan Beulich wrote:
>> >>> On 02.10.12 at 13:45, Stefano Stabellini <stefano.stabellini@eu•citrix.com>
> 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 see
>> >> how it would be harmful to be compiled on e.g. ARM (so the
>> >> merge perhaps really should use XEN_DOM0 alone, without
>> >> X86. If anything (and that may indeed be a minor oversight of
>> >> the original patch) one might want it to depend on USB_SUPPORT,
>> >> as without that no in-tree debug port capable driver would be
>> >> able to load (and hence interfere with Xen's use of the debug
>> >> port). However, as long as it builds fine with USB_SUPPORT
>> >> undefined (which I believe it does), having it in the shape it
>> >> is allows for out-of-tree drivers as well (as long as they make
>> >> use of the designated interface).
>> >
>> > OK for PCI.
>> > Regarding USB_SUPPORT, considering that gbgp.c calls hcd_to_bus, I think
>> > it would make sense to make it depend on it.
>>
>> As said - I'd prefer to do that only if indeed needed to get things
>> to build without that option. Since include/usb/* doesn't reference
>> CONFIG_USB_SUPPORT, I'm in favor of supporting at least those
>> eventual out-of-tree drivers that do use the pre-existing data
>> structures (and others shouldn't be calling pre-existing APIs
>> anyway). But I wouldn't NAK a patch doing what you suggest
>> either.
>
> Could it depend on EARLY_PRINTK_DBGP ?
No, that one would definitely be wrong (because we need the
EHCI driver to propagate reset information no matter whether
the kernel uses an early console).
Jan
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-10-02 13:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox