From: Bjorn Helgaas <bhelgaas@google.com>
To: linux-pci@vger.kernel.org
Subject: Changes for v3.10 merge window
Date: Tue, 16 Apr 2013 11:17:32 -0600 [thread overview]
Message-ID: <20130416171732.GA6356@google.com> (raw)
Below are the patches currently in my "next" branch, planned for
release in v3.10. If I'm missing something important, let me know.
Andy Shevchenko (1):
PCI: Fix missing prototype for pcie_port_acpi_setup()
Bjorn Helgaas (20):
Merge branch 'pci/shuah-defines' into next
PCI: Remove __weak annotation from pcibios_get_phb_of_node decl
PCI: Make local functions/structs static
PCI: Move cpci_hotplug_init() proto to header file
PCI: Remove unused variables
PCI: Fix __must_check annotation on pci_create_sysfs_dev_files()
PCI: Remove __must_check from definitions
PCI: Warn about failures instead of "must_check" functions
PCI: Remove "extern" from function declarations
Merge branch 'pci/gabor-get-of-node' into next
PCI: Remove unnecessary dependencies between PME and ACPI
PCI: Use PCI_EXP_SLTCAP_PSN mask when extracting slot number
EISA: Use dev_printk() when possible
EISA: Mark vendor ID resource as I/O port space
EISA: Initialize device before its resources
EISA: Log device resources in dmesg
Merge branch 'pci/bjorn-eisa' into next
Merge branch 'pci/misc' into next
Merge branch 'pci/jiang-subdrivers' into next
Merge branch 'pci/cleanup' into next
Gabor Juhos (1):
MIPS/PCI: Implement pcibios_get_phb_of_node
Jiang Liu (12):
PCI: When removing bus, always remove legacy files & unregister
PCI: Clean up usages of pci_bus->is_added
PCI: acpiphp: Remove all functions even if function 0 doesn't exist
PCI: acpiphp: Replace local macros with standard ACPI macros
PCI: Add pcibios hooks for adding and removing PCI buses
PCI/ACPI: Prepare stub functions to handle ACPI PCI (hotplug) slots
ia64/PCI: Implement pcibios_{add|remove}_bus() hooks
x86/PCI: Implement pcibios_{add|remove}_bus() hooks
PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses
PCI: acpiphp: Convert acpiphp to be builtin only, not modular
PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
PCI: acpiphp: Protect acpiphp data structures from concurrent updates
Libin (1):
PCI: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Myron Stowe (4):
ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
[SCSI] mvsas: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
PCI/ACPI: Remove support of ACPI PCI subdrivers
Prarit Bhargava (1):
PCI: aer_inject: Fix return values when device not found
Shuah Khan (4):
PCI: Add PCI_BUS_NUM() and PCI_DEVID() interfaces
PCI/AER: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
iommu/amd: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
iommu/amd: Remove calc_devid() and use PCI_DEVID() from PCI
Xiangliang Yu (1):
PCI: Define macro for Marvell vendor ID
Xiong Huang (1):
PCI: Add MSI INTX_DISABLE quirks for AR8161/AR8162/AR8171/AR8172/E210X
Yijing Wang (2):
PCI: acpiphp: Use list_for_each_entry_safe() in acpiphp_sanitize_bus()
PCI: acpiphp: Use normal list to simplify implementation
Yinghai Lu (1):
PCI: Clean up quirk_io_region
arch/ia64/pci/pci.c | 11 +
arch/mips/pci/pci.c | 8 +-
arch/x86/pci/common.c | 11 +
drivers/acpi/pci_root.c | 48 +---
drivers/acpi/pci_slot.c | 170 ++------------
drivers/acpi/scan.c | 1 -
drivers/ata/ahci.c | 10 +-
drivers/eisa/eisa-bus.c | 82 +++----
drivers/eisa/pci_eisa.c | 5 +-
drivers/iommu/amd_iommu.c | 14 +-
drivers/iommu/amd_iommu_init.c | 40 ++--
drivers/iommu/amd_iommu_types.h | 11 +-
drivers/pci/bus.c | 18 +-
drivers/pci/hotplug/Kconfig | 7 +-
drivers/pci/hotplug/acpiphp.h | 35 ++-
drivers/pci/hotplug/acpiphp_core.c | 30 +--
drivers/pci/hotplug/acpiphp_glue.c | 415 ++++++++++++---------------------
drivers/pci/hotplug/cpci_hotplug.h | 44 ++--
drivers/pci/hotplug/cpqphp.h | 70 +++---
drivers/pci/hotplug/cpqphp_nvram.h | 12 +-
drivers/pci/hotplug/ibmphp.h | 66 +++---
drivers/pci/hotplug/pci_hotplug_core.c | 15 +-
drivers/pci/hotplug/pciehp.h | 22 +-
drivers/pci/hotplug/pciehp_acpi.c | 2 +-
drivers/pci/hotplug/rpadlpar.h | 8 +-
drivers/pci/hotplug/rpaphp.h | 16 +-
drivers/pci/hotplug/shpchp.h | 26 +--
drivers/pci/hotplug/shpchp_sysfs.c | 2 +-
drivers/pci/msi.c | 4 +-
drivers/pci/pci-acpi.c | 30 +++
drivers/pci/pci-sysfs.c | 4 +-
drivers/pci/pci.c | 8 +-
drivers/pci/pci.h | 89 ++++---
drivers/pci/pcie/Kconfig | 2 +-
drivers/pci/pcie/aer/aer_inject.c | 10 +-
drivers/pci/pcie/aer/aerdrv.h | 14 +-
drivers/pci/pcie/aer/aerdrv_core.c | 4 +-
drivers/pci/pcie/pme.c | 2 -
drivers/pci/pcie/portdrv.h | 18 +-
drivers/pci/pcie/portdrv_acpi.c | 1 +
drivers/pci/pcie/portdrv_pci.c | 17 +-
drivers/pci/probe.c | 15 +-
drivers/pci/quirks.c | 148 +++++-------
drivers/pci/remove.c | 4 +-
drivers/pci/setup-bus.c | 4 +-
drivers/pci/setup-res.c | 2 -
drivers/pci/slot.c | 7 +-
drivers/scsi/mvsas/mv_init.c | 6 +-
drivers/scsi/mvumi.c | 4 +-
drivers/scsi/mvumi.h | 1 -
include/linux/acpi.h | 9 -
include/linux/pci-acpi.h | 29 +++
include/linux/pci-aspm.h | 20 +-
include/linux/pci-ats.h | 26 +--
include/linux/pci.h | 112 +++++----
include/linux/pci_hotplug.h | 12 +-
include/linux/pci_ids.h | 1 +
include/linux/pcieport_if.h | 4 +-
58 files changed, 764 insertions(+), 1042 deletions(-)
next reply other threads:[~2013-04-16 17:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 17:17 Bjorn Helgaas [this message]
2013-04-17 6:08 ` Changes for v3.10 merge window Yinghai Lu
2013-04-17 16:25 ` Rafael J. Wysocki
2013-04-17 16:47 ` Bjorn Helgaas
2013-04-17 18:45 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130416171732.GA6356@google.com \
--to=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox