Merge remote-tracking branch 'pci/next'

Conflicts:
	drivers/acpi/pci_root.c
	drivers/pci/probe.c
	include/linux/aer.h

diff --cc drivers/acpi/apei/ghes.c
index fcd7d91cec34af25ed8ccfc32188a24b677c641b,ab315515908eb921caa1f0768d5c79aceb6293a2..ec9b57d428a1e028a0cdf3215e3ebddad9634818
--- 1/drivers/acpi/apei/ghes.c
--- 2/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@@ -452,11 -453,18 +453,20 @@@ static void ghes_do_proc(struct ghes *g
                                devfn = PCI_DEVFN(pcie_err->device_id.device,
                                                  pcie_err->device_id.function);
                                aer_severity = cper_severity_to_aer(sev);
+ 
+                               /*
+                                * If firmware reset the component to contain
+                                * the error, we must reinitialize it before
+                                * use, so treat it as a fatal AER error.
+                                */
+                               if (gdata->flags & CPER_SEC_RESET)
+                                       aer_severity = AER_FATAL;
+ 
                                aer_recover_queue(pcie_err->device_id.segment,
                                                  pcie_err->device_id.bus,
 -                                                devfn, aer_severity);
 +                                                devfn, aer_severity,
 +                                                (struct aer_capability_regs *)
 +                                                pcie_err->aer_info);
                        }
  
                }

diff --cc drivers/acpi/pci_root.c
index e427dc516c76d1d8d73b5a91c7d4f1f73b83cfbf,122b4dc7b0faed4653189e2f01e987f12c2208b0..5917839321b8bb01254f57e0cde630f637ff76b2
--- 1/drivers/acpi/pci_root.c
--- 2/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@@ -639,11 -620,9 +620,11 @@@ static void _handle_hotplug_event_root(
        switch (type) {
        case ACPI_NOTIFY_BUS_CHECK:
                /* bus enumerate */
-               printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
-                                (char *)buffer.pointer);
+               acpi_handle_printk(KERN_DEBUG, handle,
+                                  "Bus check notify on %s\n", __func__);
 -              if (!root)
 +              if (root)
 +                      acpiphp_check_host_bridge(handle);
 +              else
                        handle_root_bridge_insertion(handle);
  
                break;

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/pci/pcie/aer/aerdrv_core.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc include/linux/aer.h
index 737f90ab4b6235abd340b1c47d9308591c138e8b,55bb3dc4b2db954eaf590aa93f550dfc36e82768..a673e490a1e8703a6d40ce2ed7fa4e7252d33819
--- 1/include/linux/aer.h
--- 2/include/linux/aer.h
+++ b/include/linux/aer.h
@@@ -49,11 -53,10 +53,10 @@@ static inline int pci_cleanup_aer_uncor
  }
  #endif
  
- extern void cper_print_aer(struct pci_dev *dev,
-                          int cper_severity, struct aer_capability_regs *aer);
- extern int cper_severity_to_aer(int cper_severity);
- extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
-                             int severity,
-                             struct aer_capability_regs *aer_regs);
 -void cper_print_aer(const char *prefix, struct pci_dev *dev, int cper_severity,
++void cper_print_aer(struct pci_dev *dev, int cper_severity,
+                   struct aer_capability_regs *aer);
+ int cper_severity_to_aer(int cper_severity);
+ void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
 -                     int severity);
++                     int severity, struct aer_capability_regs *aer_regs);
  #endif //_AER_H_