Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa8032b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "Yinghai fixed a couple regressions: one resource assignment problem
  introduced in v3.10 that showed up with SR-IOV on powerpc, and another
  SR-IOV hot-remove issue related to refcounting changes we merged for
  v3.11.

  Yinghai is still working on another SR-IOV-related fix or two, which
  will be simpler if pciehp is non-modular, so I included the Kconfig
  changes now to get them in earlier.

  Finally, a minor fix for the ARM Marvell EBU host bridge driver that
  was merged for v3.11

  Hotplug:
      PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device
      PCI: hotplug: Convert to be builtin only, not modular
      PCI: pciehp: Convert pciehp to be builtin only, not modular

  Resource allocation:
      PCI: Retry allocation of only the resource type that failed

  ARM:
      PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge"

* tag 'pci-v3.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge
  PCI: Retry allocation of only the resource type that failed
  PCI: pciehp: Convert pciehp to be builtin only, not modular
  PCI: hotplug: Convert to be builtin only, not modular
  PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device
parents 1fe0135b 36dd1f3e

arch/ia64/configs/generic_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ CONFIG_ACPI_FAN=m 
CONFIG_ACPI_DOCK=y

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_CONTAINER=m

CONFIG_HOTPLUG_PCI=m

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=m

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/ia64/configs/gensparse_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ CONFIG_ACPI_BUTTON=m 
CONFIG_ACPI_FAN=m

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_CONTAINER=m

CONFIG_HOTPLUG_PCI=m

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=m

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/ia64/configs/tiger_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ CONFIG_ACPI_BUTTON=m 
CONFIG_ACPI_FAN=m

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_CONTAINER=m

CONFIG_HOTPLUG_PCI=m

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=m

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/ia64/configs/xen_domu_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ CONFIG_ACPI_BUTTON=m 
CONFIG_ACPI_FAN=m

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_CONTAINER=m

CONFIG_HOTPLUG_PCI=m

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=m

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/powerpc/configs/ppc64_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ CONFIG_SCHED_SMT=y 
CONFIG_PPC_DENORMALISATION=y

CONFIG_PCCARD=y

CONFIG_ELECTRA_CF=y

CONFIG_HOTPLUG_PCI=m

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_RPA=m

CONFIG_HOTPLUG_PCI_RPA_DLPAR=m

CONFIG_PACKET=y