Hi Rafael, Today's linux-next merge of the pm tree got a conflict in drivers/acpi/scan.c between commit 5c0b04e3d913 ("PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses") from the pci tree and commit 0a34764411aa ("ACPI / scan: Make memory hotplug driver use struct acpi_scan_handler") from the pm 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 drivers/acpi/scan.c index f54d198,d7f3c8b..0000000 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@@ -1788,8 -2041,11 +2041,10 @@@ int __init acpi_scan_init(void acpi_pci_root_init(); acpi_pci_link_init(); acpi_platform_init(); + acpi_lpss_init(); acpi_csrt_init(); acpi_container_init(); - acpi_pci_slot_init(); + acpi_memory_hotplug_init(); mutex_lock(&acpi_scan_lock); /*
Attachment:
pgpVsTyaYO1w5.pgp
Description: PGP signature