Merge branch 'topic/bjorn-trivial' into next

* topic/bjorn-trivial:
  PCI: remove useless pcix_set_mmrbc() dev->bus check
  PCI: acpiphp: check whether _ADR evaluation succeeded
  PCI: shpchp: remove dead code
  PCI: fix P2P bridge I/O port window sign extension
  PCI: fix upstream P2P bridge checks when enabling OBFF and LTR
  PCI: use __weak consistently
  PCI: cleanup assign_requested_resources_sorted() kernel-doc warning
  sparc/PCI: remove unused pcibios_assign_resource() definition

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

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

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

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