From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 1 Aug 2016 17:23:31 +0000 (-0500)
Subject: Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a00c74c1664e6de4ad671c7c921a06ef164622c0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/pm' and 'pci/virtualization' into next

* pci/aspm:
  PCI/ASPM: Remove redundant check of pcie_set_clkpm

* pci/dpc:
  PCI: Remove DPC tristate module option
  PCI: Bind DPC to Root Ports as well as Downstream Ports
  PCI: Fix whitespace in struct dpc_dev
  PCI: Convert Downstream Port Containment driver to use devm_* functions

* pci/hotplug:
  PCI: Allow additional bus numbers for hotplug bridges

* pci/misc:
  PCI: Include <asm/dma.h> for isa_dma_bridge_buggy
  PCI: Make bus_attr_resource_alignment static
  MAINTAINERS: Add file patterns for PCI device tree bindings
  PCI: Fix comment typo

* pci/msi:
  PCI/MSI: irqchip: Fix PCI_MSI dependencies

* pci/pm:
  PCI: pciehp: Ignore interrupts during D3cold
  PCI: Document connection between pci_power_t and hardware PM capability
  PCI: Add runtime PM support for PCIe ports
  ACPI / hotplug / PCI: Runtime resume bridge before rescan
  PCI: Power on bridges before scanning new devices
  PCI: Put PCIe ports into D3 during suspend
  PCI: Don't clear d3cold_allowed for PCIe ports
  PCI / PM: Enforce type casting for pci_power_t

* pci/virtualization:
  PCI: Add ACS quirk for Solarflare SFC9220
  PCI: Add DMA alias quirk for Adaptec 3805
  PCI: Mark Atheros AR9485 and QCA9882 to avoid bus reset
  PCI: Add function 1 DMA alias quirk for Marvell 88SE9182
---

a00c74c1664e6de4ad671c7c921a06ef164622c0
diff --cc drivers/pci/pci.c
index 4834ceeca0d2,c8b4dbdd1bdd,c8b4dbdd1bdd,f18ea90cf91a,86b538d6a2a5,c8b4dbdd1bdd,9ff7183e25a2,c8b4dbdd1bdd..14d24b4fc508
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@@@@@@@ -7,9 -7,8 -7,8 -7,8 -7,8 -7,8 -7,9 -7,8 +7,10 @@@@@@@@@
         *	Copyright 1997 -- 2000 Martin Mares <mj@ucw.cz>
         */
        
 +++++++#include <linux/acpi.h>
        #include <linux/kernel.h>
        #include <linux/delay.h>
++++++ +#include <linux/dmi.h>
        #include <linux/init.h>
        #include <linux/of.h>
        #include <linux/of_pci.h>
@@@@@@@@@ -26,8 -25,7 -25,7 -25,7 -25,8 -25,7 -26,7 -25,7 +27,9 @@@@@@@@@
        #include <linux/device.h>
        #include <linux/pm_runtime.h>
        #include <linux/pci_hotplug.h>
 +++++++#include <linux/vmalloc.h>
        #include <asm/setup.h>
++++ +++#include <asm/dma.h>
        #include <linux/aer.h>
        #include "pci.h"