* [GIT PULL] PCI updates for v3.13
@ 2013-11-20 21:28 Bjorn Helgaas
2013-11-20 23:05 ` Bjorn Helgaas
0 siblings, 1 reply; 4+ messages in thread
From: Bjorn Helgaas @ 2013-11-20 21:28 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-pci, linux-kernel, Yinghai Lu, Alexander Duyck,
Rafael J. Wysocki
The following changes since commit 4fbf888accb39af423f271111d44e8186f053723:
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (2013-11-14 17:19:58 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v3.13-fixes-1
for you to fetch changes up to 30b7fc1277c74667d0d5421526dc5f7a7fa926c5:
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove() (2013-11-18 17:02:45 -0700)
----------------------------------------------------------------
PCI updates for v3.13:
Miscellaneous
- Avoid CPU switch for .probe() methods (Alexander Duyck)
- Restore work_on_cpu() lockdep annotation (Bjorn Helgaas)
- Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
- Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)
----------------------------------------------------------------
Alexander Duyck (1):
PCI: Avoid unnecessary CPU switch when calling driver .probe() method
Bjorn Helgaas (2):
PCI: Fix whitespace, capitalization, and spelling errors
Revert "workqueue: allow work_on_cpu() to be called recursively"
Yinghai Lu (1):
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
drivers/pci/ats.c | 2 +-
drivers/pci/host/pci-tegra.c | 12 ++--
drivers/pci/host/pcie-designware.c | 2 +-
drivers/pci/hotplug/Kconfig | 4 +-
drivers/pci/hotplug/Makefile | 2 +-
drivers/pci/hotplug/acpiphp_core.c | 12 ++--
drivers/pci/hotplug/acpiphp_glue.c | 2 +-
drivers/pci/hotplug/acpiphp_ibm.c | 14 ++--
drivers/pci/hotplug/cpci_hotplug_core.c | 2 +-
drivers/pci/hotplug/cpci_hotplug_pci.c | 2 +-
drivers/pci/hotplug/cpcihp_generic.c | 20 +++---
drivers/pci/hotplug/cpcihp_zt5550.c | 22 +++----
drivers/pci/hotplug/cpcihp_zt5550.h | 18 +++---
drivers/pci/hotplug/cpqphp_core.c | 4 +-
drivers/pci/hotplug/cpqphp_ctrl.c | 10 +--
drivers/pci/hotplug/cpqphp_pci.c | 5 +-
drivers/pci/hotplug/ibmphp.h | 12 ++--
drivers/pci/hotplug/ibmphp_core.c | 109 ++++++++++++++++----------------
drivers/pci/hotplug/ibmphp_ebda.c | 103 +++++++++++++++---------------
drivers/pci/hotplug/ibmphp_hpc.c | 24 +++----
drivers/pci/hotplug/ibmphp_pci.c | 71 ++++++++++-----------
drivers/pci/hotplug/ibmphp_res.c | 76 +++++++++++-----------
drivers/pci/hotplug/pci_hotplug_core.c | 8 +--
drivers/pci/hotplug/pciehp.h | 2 +-
drivers/pci/hotplug/pciehp_acpi.c | 2 +-
drivers/pci/hotplug/pciehp_core.c | 4 +-
drivers/pci/hotplug/pciehp_hpc.c | 6 +-
drivers/pci/hotplug/pcihp_skeleton.c | 8 +--
drivers/pci/hotplug/rpadlpar_core.c | 2 +-
drivers/pci/hotplug/rpaphp.h | 6 +-
drivers/pci/hotplug/rpaphp_core.c | 8 +--
drivers/pci/hotplug/rpaphp_pci.c | 3 +-
drivers/pci/hotplug/rpaphp_slot.c | 19 +++---
drivers/pci/hotplug/shpchp.h | 8 +--
drivers/pci/hotplug/shpchp_core.c | 10 +--
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/pci/iov.c | 2 +-
drivers/pci/irq.c | 2 +-
drivers/pci/msi.c | 2 +-
drivers/pci/pci-acpi.c | 2 +-
drivers/pci/pci-driver.c | 40 ++++++++----
drivers/pci/pci-stub.c | 4 +-
drivers/pci/pci-sysfs.c | 28 ++++----
drivers/pci/pci.c | 46 +++++++-------
drivers/pci/pcie/aer/aerdrv_core.c | 2 +-
drivers/pci/pcie/aspm.c | 2 +-
drivers/pci/pcie/pme.c | 4 +-
drivers/pci/pcie/portdrv.h | 2 +-
drivers/pci/pcie/portdrv_bus.c | 4 +-
drivers/pci/pcie/portdrv_core.c | 2 +-
drivers/pci/pcie/portdrv_pci.c | 7 +-
drivers/pci/probe.c | 10 +--
drivers/pci/proc.c | 2 +-
drivers/pci/quirks.c | 104 +++++++++++++++---------------
drivers/pci/remove.c | 2 +-
drivers/pci/search.c | 12 ++--
drivers/pci/setup-bus.c | 18 +++---
drivers/pci/setup-res.c | 2 +-
drivers/pci/slot.c | 2 +-
drivers/pci/syscall.c | 2 +-
include/linux/msi.h | 10 +--
include/linux/pci.h | 55 ++++++++--------
include/linux/pci_hotplug.h | 5 +-
include/linux/pcieport_if.h | 2 +-
include/uapi/linux/pci_regs.h | 72 ++++++++++-----------
kernel/workqueue.c | 32 +++-------
66 files changed, 547 insertions(+), 548 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] PCI updates for v3.13
2013-11-20 21:28 Bjorn Helgaas
@ 2013-11-20 23:05 ` Bjorn Helgaas
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2013-11-20 23:05 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu, Alexander Duyck, Rafael J. Wysocki, Jiri Slaby,
Tejun Heo
[+cc Jiri, Tejun]
On Wed, Nov 20, 2013 at 2:28 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> The following changes since commit 4fbf888accb39af423f271111d44e8186f053723:
>
> Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (2013-11-14 17:19:58 +0900)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v3.13-fixes-1
>
> for you to fetch changes up to 30b7fc1277c74667d0d5421526dc5f7a7fa926c5:
Sigh, please ignore this until we figure out the "scheduling while
atomic" problem Jiri reported [1]. Sorry.
[1] http://lkml.kernel.org/r/528D3F36.3050403@suse.cz
>
> PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove() (2013-11-18 17:02:45 -0700)
>
> ----------------------------------------------------------------
> PCI updates for v3.13:
>
> Miscellaneous
> - Avoid CPU switch for .probe() methods (Alexander Duyck)
> - Restore work_on_cpu() lockdep annotation (Bjorn Helgaas)
> - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
> - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)
>
> ----------------------------------------------------------------
> Alexander Duyck (1):
> PCI: Avoid unnecessary CPU switch when calling driver .probe() method
>
> Bjorn Helgaas (2):
> PCI: Fix whitespace, capitalization, and spelling errors
> Revert "workqueue: allow work_on_cpu() to be called recursively"
>
> Yinghai Lu (1):
> PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
>
> drivers/pci/ats.c | 2 +-
> drivers/pci/host/pci-tegra.c | 12 ++--
> drivers/pci/host/pcie-designware.c | 2 +-
> drivers/pci/hotplug/Kconfig | 4 +-
> drivers/pci/hotplug/Makefile | 2 +-
> drivers/pci/hotplug/acpiphp_core.c | 12 ++--
> drivers/pci/hotplug/acpiphp_glue.c | 2 +-
> drivers/pci/hotplug/acpiphp_ibm.c | 14 ++--
> drivers/pci/hotplug/cpci_hotplug_core.c | 2 +-
> drivers/pci/hotplug/cpci_hotplug_pci.c | 2 +-
> drivers/pci/hotplug/cpcihp_generic.c | 20 +++---
> drivers/pci/hotplug/cpcihp_zt5550.c | 22 +++----
> drivers/pci/hotplug/cpcihp_zt5550.h | 18 +++---
> drivers/pci/hotplug/cpqphp_core.c | 4 +-
> drivers/pci/hotplug/cpqphp_ctrl.c | 10 +--
> drivers/pci/hotplug/cpqphp_pci.c | 5 +-
> drivers/pci/hotplug/ibmphp.h | 12 ++--
> drivers/pci/hotplug/ibmphp_core.c | 109 ++++++++++++++++----------------
> drivers/pci/hotplug/ibmphp_ebda.c | 103 +++++++++++++++---------------
> drivers/pci/hotplug/ibmphp_hpc.c | 24 +++----
> drivers/pci/hotplug/ibmphp_pci.c | 71 ++++++++++-----------
> drivers/pci/hotplug/ibmphp_res.c | 76 +++++++++++-----------
> drivers/pci/hotplug/pci_hotplug_core.c | 8 +--
> drivers/pci/hotplug/pciehp.h | 2 +-
> drivers/pci/hotplug/pciehp_acpi.c | 2 +-
> drivers/pci/hotplug/pciehp_core.c | 4 +-
> drivers/pci/hotplug/pciehp_hpc.c | 6 +-
> drivers/pci/hotplug/pcihp_skeleton.c | 8 +--
> drivers/pci/hotplug/rpadlpar_core.c | 2 +-
> drivers/pci/hotplug/rpaphp.h | 6 +-
> drivers/pci/hotplug/rpaphp_core.c | 8 +--
> drivers/pci/hotplug/rpaphp_pci.c | 3 +-
> drivers/pci/hotplug/rpaphp_slot.c | 19 +++---
> drivers/pci/hotplug/shpchp.h | 8 +--
> drivers/pci/hotplug/shpchp_core.c | 10 +--
> drivers/pci/hotplug/shpchp_hpc.c | 2 +-
> drivers/pci/iov.c | 2 +-
> drivers/pci/irq.c | 2 +-
> drivers/pci/msi.c | 2 +-
> drivers/pci/pci-acpi.c | 2 +-
> drivers/pci/pci-driver.c | 40 ++++++++----
> drivers/pci/pci-stub.c | 4 +-
> drivers/pci/pci-sysfs.c | 28 ++++----
> drivers/pci/pci.c | 46 +++++++-------
> drivers/pci/pcie/aer/aerdrv_core.c | 2 +-
> drivers/pci/pcie/aspm.c | 2 +-
> drivers/pci/pcie/pme.c | 4 +-
> drivers/pci/pcie/portdrv.h | 2 +-
> drivers/pci/pcie/portdrv_bus.c | 4 +-
> drivers/pci/pcie/portdrv_core.c | 2 +-
> drivers/pci/pcie/portdrv_pci.c | 7 +-
> drivers/pci/probe.c | 10 +--
> drivers/pci/proc.c | 2 +-
> drivers/pci/quirks.c | 104 +++++++++++++++---------------
> drivers/pci/remove.c | 2 +-
> drivers/pci/search.c | 12 ++--
> drivers/pci/setup-bus.c | 18 +++---
> drivers/pci/setup-res.c | 2 +-
> drivers/pci/slot.c | 2 +-
> drivers/pci/syscall.c | 2 +-
> include/linux/msi.h | 10 +--
> include/linux/pci.h | 55 ++++++++--------
> include/linux/pci_hotplug.h | 5 +-
> include/linux/pcieport_if.h | 2 +-
> include/uapi/linux/pci_regs.h | 72 ++++++++++-----------
> kernel/workqueue.c | 32 +++-------
> 66 files changed, 547 insertions(+), 548 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] PCI updates for v3.13
@ 2013-11-21 21:46 Bjorn Helgaas
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2013-11-21 21:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-pci, linux-kernel, Rafael J. Wysocki, Yinghai Lu
Hi Linus,
I dropped the work_on_cpu() changes that caused trouble. I'll put those in
later, but would like these to get in -rc1 to prevent merge hassles.
The following changes since commit 4fbf888accb39af423f271111d44e8186f053723:
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (2013-11-14 17:19:58 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v3.13-fixes-1
for you to fetch changes up to e7cc5cf74544d97d7b69e2701595037474db1f96:
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove() (2013-11-20 16:05:49 -0700)
----------------------------------------------------------------
PCI updates for v3.13:
Miscellaneous
- Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
- Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)
----------------------------------------------------------------
Bjorn Helgaas (1):
PCI: Fix whitespace, capitalization, and spelling errors
Yinghai Lu (1):
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
drivers/pci/ats.c | 2 +-
drivers/pci/host/pci-tegra.c | 12 ++--
drivers/pci/host/pcie-designware.c | 2 +-
drivers/pci/hotplug/Kconfig | 4 +-
drivers/pci/hotplug/Makefile | 2 +-
drivers/pci/hotplug/acpiphp_core.c | 12 ++--
drivers/pci/hotplug/acpiphp_glue.c | 2 +-
drivers/pci/hotplug/acpiphp_ibm.c | 14 ++--
drivers/pci/hotplug/cpci_hotplug_core.c | 2 +-
drivers/pci/hotplug/cpci_hotplug_pci.c | 2 +-
drivers/pci/hotplug/cpcihp_generic.c | 20 +++---
drivers/pci/hotplug/cpcihp_zt5550.c | 22 +++----
drivers/pci/hotplug/cpcihp_zt5550.h | 18 +++---
drivers/pci/hotplug/cpqphp_core.c | 4 +-
drivers/pci/hotplug/cpqphp_ctrl.c | 10 +--
drivers/pci/hotplug/cpqphp_pci.c | 5 +-
drivers/pci/hotplug/ibmphp.h | 12 ++--
drivers/pci/hotplug/ibmphp_core.c | 109 ++++++++++++++++----------------
drivers/pci/hotplug/ibmphp_ebda.c | 103 +++++++++++++++---------------
drivers/pci/hotplug/ibmphp_hpc.c | 24 +++----
drivers/pci/hotplug/ibmphp_pci.c | 71 ++++++++++-----------
drivers/pci/hotplug/ibmphp_res.c | 76 +++++++++++-----------
drivers/pci/hotplug/pci_hotplug_core.c | 8 +--
drivers/pci/hotplug/pciehp.h | 2 +-
drivers/pci/hotplug/pciehp_acpi.c | 2 +-
drivers/pci/hotplug/pciehp_core.c | 4 +-
drivers/pci/hotplug/pciehp_hpc.c | 6 +-
drivers/pci/hotplug/pcihp_skeleton.c | 8 +--
drivers/pci/hotplug/rpadlpar_core.c | 2 +-
drivers/pci/hotplug/rpaphp.h | 6 +-
drivers/pci/hotplug/rpaphp_core.c | 8 +--
drivers/pci/hotplug/rpaphp_pci.c | 3 +-
drivers/pci/hotplug/rpaphp_slot.c | 19 +++---
drivers/pci/hotplug/shpchp.h | 8 +--
drivers/pci/hotplug/shpchp_core.c | 10 +--
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/pci/iov.c | 2 +-
drivers/pci/irq.c | 2 +-
drivers/pci/msi.c | 2 +-
drivers/pci/pci-acpi.c | 2 +-
drivers/pci/pci-driver.c | 16 ++---
drivers/pci/pci-stub.c | 4 +-
drivers/pci/pci-sysfs.c | 28 ++++----
drivers/pci/pci.c | 46 +++++++-------
drivers/pci/pcie/aer/aerdrv_core.c | 2 +-
drivers/pci/pcie/aspm.c | 2 +-
drivers/pci/pcie/pme.c | 4 +-
drivers/pci/pcie/portdrv.h | 2 +-
drivers/pci/pcie/portdrv_bus.c | 4 +-
drivers/pci/pcie/portdrv_core.c | 2 +-
drivers/pci/pcie/portdrv_pci.c | 7 +-
drivers/pci/probe.c | 10 +--
drivers/pci/proc.c | 2 +-
drivers/pci/quirks.c | 104 +++++++++++++++---------------
drivers/pci/remove.c | 2 +-
drivers/pci/search.c | 12 ++--
drivers/pci/setup-bus.c | 18 +++---
drivers/pci/setup-res.c | 2 +-
drivers/pci/slot.c | 2 +-
drivers/pci/syscall.c | 2 +-
include/linux/msi.h | 10 +--
include/linux/pci.h | 55 ++++++++--------
include/linux/pci_hotplug.h | 5 +-
include/linux/pcieport_if.h | 2 +-
include/uapi/linux/pci_regs.h | 72 ++++++++++-----------
65 files changed, 518 insertions(+), 521 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] PCI updates for v3.13
@ 2013-12-14 19:31 Bjorn Helgaas
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2013-12-14 19:31 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-pci, linux-kernel, Khalid Aziz, Chang Liu,
Konstantin Khlebnikov, Jason Gunthorpe, Michal Marek,
Rafael J. Wysocki, Alexander Duyck
The following changes since commit 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae:
Linux 3.13-rc1 (2013-11-22 11:30:55 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v3.13-fixes-2
for you to fetch changes up to f0b75693cbb26439ba959ba7d3b4f43e2fcf3da6:
MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers (2013-12-11 10:40:59 -0700)
----------------------------------------------------------------
PCI updates for v3.13:
PCI device hotplug
- Move device_del() from pci_stop_dev() to pci_destroy_dev() (Rafael J. Wysocki)
Host bridge drivers
- Update maintainers for DesignWare, i.MX6, Armada, R-Car (Bjorn Helgaas)
- mvebu: Return 'unsupported' for Interrupt Line and Interrupt Pin (Jason Gunthorpe)
Miscellaneous
- Avoid unnecessary CPU switch when calling .probe() (Alexander Duyck)
- Revert "workqueue: allow work_on_cpu() to be called recursively" (Bjorn Helgaas)
- Disable Bus Master only on kexec reboot (Khalid Aziz)
- Omit PCI ID macro strings to shorten quirk names for LTO (Michal Marek)
MAINTAINERS | 33 +++++++++++++++++++++++++++++++++
drivers/pci/host/pci-mvebu.c | 5 +++++
drivers/pci/pci-driver.c | 38 ++++++++++++++++++++++++++++++--------
drivers/pci/remove.c | 4 +++-
include/linux/kexec.h | 3 +++
include/linux/pci.h | 30 +++++++++++++++---------------
kernel/kexec.c | 4 ++++
kernel/workqueue.c | 32 ++++++++++----------------------
8 files changed, 103 insertions(+), 46 deletions(-)
----------------------------------------------------------------
Alexander Duyck (1):
PCI: Avoid unnecessary CPU switch when calling driver .probe() method
Bjorn Helgaas (2):
Revert "workqueue: allow work_on_cpu() to be called recursively"
MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers
Jason Gunthorpe (1):
PCI: mvebu: Return 'unsupported' for Interrupt Line and Interrupt Pin
Khalid Aziz (1):
PCI: Disable Bus Master only on kexec reboot
Michal Marek (1):
PCI: Omit PCI ID macro strings to shorten quirk names
Rafael J. Wysocki (1):
PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()
MAINTAINERS | 33 +++++++++++++++++++++++++++++++++
drivers/pci/host/pci-mvebu.c | 5 +++++
drivers/pci/pci-driver.c | 38 ++++++++++++++++++++++++++++++--------
drivers/pci/remove.c | 4 +++-
include/linux/kexec.h | 3 +++
include/linux/pci.h | 30 +++++++++++++++---------------
kernel/kexec.c | 4 ++++
kernel/workqueue.c | 32 ++++++++++----------------------
8 files changed, 103 insertions(+), 46 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-14 19:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-21 21:46 [GIT PULL] PCI updates for v3.13 Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2013-12-14 19:31 Bjorn Helgaas
2013-11-20 21:28 Bjorn Helgaas
2013-11-20 23:05 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).