Merge branch 'pci/resource'

  - Clean up devm_of_pci_get_host_bridge_resources() resource allocation
    (Jan Kiszka)

  - Fixup resizable BARs after suspend/resume (Christian König)

  - Make "pci=earlydump" generic (Sinan Kaya)

  - Fix ROM BAR access routines to stay in bounds and check for signature
    correctly (Rex Zhu)

* pci/resource:
  PCI: Make pci_get_rom_size() static
  PCI: Add check code for last image indicator not set
  PCI: Avoid accessing memory outside the ROM BAR
  PCI: Make early dump functionality generic
  PCI: Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling
  PCI: Restore resized BAR state on resume
  PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources()

# Conflicts:
#	Documentation/admin-guide/kernel-parameters.txt

diff --cc Documentation/admin-guide/kernel-parameters.txt
index d5c27d947c2e31fdf89c0c1f1770afc01220ae4a,f11b9485ed7fd79518d786a3edcd75f8b71ca17c..e372208d0d29050f902938582ef20e76df97b15b
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -2994,31 -2994,8 +2994,31 @@@
                        See header of drivers/block/paride/pcd.c.
                        See also Documentation/blockdev/paride.txt.
  
 -      pci=option[,option...]  [PCI] various PCI subsystem options:
 +      pci=option[,option...]  [PCI] various PCI subsystem options.
 +
 +                              Some options herein operate on a specific device
 +                              or a set of devices (<pci_dev>). These are
 +                              specified in one of the following formats:
 +
 +                              [<domain>:]<bus>:<dev>.<func>[/<dev>.<func>]*
 +                              pci:<vendor>:<device>[:<subvendor>:<subdevice>]
 +
 +                              Note: the first format specifies a PCI
 +                              bus/device/function address which may change
 +                              if new hardware is inserted, if motherboard
 +                              firmware changes, or due to changes caused
 +                              by other kernel parameters. If the
 +                              domain is left unspecified, it is
 +                              taken to be zero. Optionally, a path
 +                              to a device through multiple device/function
 +                              addresses can be specified after the base
 +                              address (this is more robust against
 +                              renumbering issues).  The second format
 +                              selects devices using IDs from the
 +                              configuration space which may match multiple
 +                              devices in the system.
 +
-               earlydump       [X86] dump PCI config space before the kernel
+               earlydump       dump PCI config space before the kernel
                                changes anything
                off             [X86] don't probe for the PCI bus
                bios            [X86-32] force use of PCI BIOS, don't access

diff --cc drivers/pci/of.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc include/linux/pci.h
Simple merge