1
0
Fork 0
alistair23-linux/arch/x86/pci
Linus Torvalds 475c77edf8 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
Pull PCI changes (including maintainer change) from Jesse Barnes:
 "This pull has some good cleanups from Bjorn and Yinghai, as well as
  some more code from Yinghai to better handle resource re-allocation
  when enabled.

  There's also a new initcall_debug feature from Arjan which will print
  out quirk timing information to help identify slow quirks for fixing
  or refinement (Yinghai sent in a few patches to do just that once the
  new debug code landed).

  Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
  He's been a core PCI and Linux contributor for some time now, and has
  kindly volunteered to take over.  I just don't feel I have the time
  for PCI review and work that it deserves lately (I've taken on some
  other projects), and haven't been as responsive lately as I'd like, so
  I approached Bjorn asking if he'd like to manage things.  He's going
  to give it a try, and I'm confident he'll do at least as well as I
  have in keeping the tree managed, patches flowing, and keeping things
  stable."

Fix up some fairly trivial conflicts due to other cleanups (mips device
resource fixup cleanups clashing with list handling cleanup, ppc iseries
removal clashing with pci_probe_only cleanup etc)

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
  PCI: Bjorn gets PCI hotplug too
  PCI: hand PCI maintenance over to Bjorn Helgaas
  unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
  sparc/PCI: convert devtree and arch-probed bus addresses to resource
  powerpc/PCI: allow reallocation on PA Semi
  powerpc/PCI: convert devtree bus addresses to resource
  powerpc/PCI: compute I/O space bus-to-resource offset consistently
  arm/PCI: don't export pci_flags
  PCI: fix bridge I/O window bus-to-resource conversion
  x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
  PCI / PCIe: Introduce command line option to disable ARI
  PCI: make acpihp use __pci_remove_bus_device instead
  PCI: export __pci_remove_bus_device
  PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
  PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
  PCI: print out PCI device info along with duration
  PCI: Move "pci reassigndev resource alignment" out of quirks.c
  PCI: Use class for quirk for usb host controller fixup
  PCI: Use class for quirk for ti816x class fixup
  PCI: Use class for quirk for intel e100 interrupt fixup
  ...
2012-03-23 14:02:12 -07:00
..
Makefile x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y 2012-01-12 07:54:18 -08:00
acpi.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-03-23 14:02:12 -07:00
amd_bus.c x86/PCI: amd: factor out MMCONFIG discovery 2012-01-06 12:11:19 -08:00
broadcom_bus.c x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan 2012-01-06 12:11:12 -08:00
bus_numa.c x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() 2012-01-06 12:11:14 -08:00
bus_numa.h Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-03-03 08:15:05 -08:00
ce4100.c x86: constify PCI raw ops structures 2011-10-14 09:05:28 -07:00
common.c x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() 2012-01-06 12:11:14 -08:00
direct.c x86: constify PCI raw ops structures 2011-10-14 09:05:28 -07:00
early.c x86/PCI: remove early PCI pr_debug statements 2009-11-24 15:25:19 -08:00
fixup.c PCI: Use class for quirk for pci_fixup_video 2012-02-24 14:34:46 -08:00
i386.c x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()' 2012-03-02 12:03:58 -08:00
init.c x86, olpc: Use pci subarch init for OLPC 2010-02-25 19:26:23 -08:00
irq.c x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs 2011-05-10 15:43:36 -07:00
legacy.c x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() 2012-01-06 12:11:13 -08:00
mmconfig-shared.c x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform 2011-06-03 16:00:03 +02:00
mmconfig_32.c x86: constify PCI raw ops structures 2011-10-14 09:05:28 -07:00
mmconfig_64.c x86: constify PCI raw ops structures 2011-10-14 09:05:28 -07:00
mrst.c x86/mrst/pci: avoid SoC fixups on non-SoC platforms 2012-02-23 12:33:27 -08:00
numaq_32.c x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() 2012-01-06 12:11:13 -08:00
olpc.c x86: constify PCI raw ops structures 2011-10-14 09:05:28 -07:00
pcbios.c typo fixes: aera -> area, exntension -> extension 2011-12-09 15:22:07 +01:00
visws.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
xen.c Features: 2012-03-22 20:16:14 -07:00