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: <20130218121105.e728f240b75b73821ff8058d@canb.auug.org.au>
Date:	Mon, 18 Feb 2013 12:11:05 +1100
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,
	Yinghai Lu <yinghai@...nel.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Jiang Liu <liuj97@...il.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/internal.h between commits 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make
pci_slot built-in only, not a module") from the pci tree and commit
00c43b968250 ("ACPI / PCI: Make PCI root 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/internal.h
index e09ce03,7909232..0000000
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -67,13 -94,6 +94,12 @@@ struct acpi_ec 

  extern struct acpi_ec *first_ec;

 +#ifdef	CONFIG_ACPI_PCI_SLOT
 +void acpi_pci_slot_init(void);
 +#else
 +static inline void acpi_pci_slot_init(void) { }
 +#endif
- int acpi_pci_root_init(void);
 +void acpi_pci_root_hp_init(void);
  int acpi_ec_init(void);
  int acpi_ec_ecdt_probe(void);
  int acpi_boot_ec_enable(void);

Content of type "application/pgp-signature" skipped