Hi all,
Today's linux-next merge of the ia64 tree got conflicts in
arch/ia64/configs/generic_defconfig,
arch/ia64/configs/gensparse_defconfig, arch/ia64/configs/tiger_defconfig
and arch/ia64/configs/xen_domu_defconfig between commit eeaa9b427947
("PCI: hotplug: Convert to be builtin only, not modular") from the
pci-current tree and commit 5da8f68fb699 ("[IA64] Change
CONFIG_HOTPLUG_PCI_ACPI=m to =y") from the ia64 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/ia64/configs/generic_defconfig
index efbd292,a4bd0ef..0000000
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@@ -31,8 -31,8 +31,8 @@@ CONFIG_ACPI_FAN=
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
diff --cc arch/ia64/configs/gensparse_defconfig
index f64980d,5e5f074..0000000
--- a/arch/ia64/configs/gensparse_defconfig
+++ b/arch/ia64/configs/gensparse_defconfig
@@@ -25,8 -25,8 +25,8 @@@ CONFIG_ACPI_BUTTON=
CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
diff --cc arch/ia64/configs/tiger_defconfig
index 0f4e9e4,7049c3d..0000000
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@@ -31,8 -31,8 +31,8 @@@ CONFIG_ACPI_BUTTON=
CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
diff --cc arch/ia64/configs/xen_domu_defconfig
index b025acf,7dc6ed7..0000000
--- a/arch/ia64/configs/xen_domu_defconfig
+++ b/arch/ia64/configs/xen_domu_defconfig
@@@ -32,8 -32,8 +32,8 @@@ CONFIG_ACPI_BUTTON=
CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_CONTAINER=m
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
Attachment:
pgpM6wni31sEw.pgp
Description: PGP signature
