linux-kernel - linux-next: manual merge of the pm tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130416124611.3dd55ea49fc6724e0994ed8e@canb.auug.org.au>
Date:	Tue, 16 Apr 2013 12:46:11 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiang Liu <liuj97@...il.com>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Subject: linux-next: manual merge of the pm tree with the pci tree

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@...b.auug.org.au

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);
  	/*

Content of type "application/pgp-signature" skipped