| Message ID | 20130930153643.GF31178@titan.lakedaemon.net |
|---|---|
| State | New |
| Headers | show |
Hi Jason, On Mon, Sep 30, 2013 at 11:36:43AM -0400, Jason Cooper wrote: > Guys, > > Here are all of the driver changes that didn't make it during the last > merge window. They've been in -next since v3.12-rc1, without > merge-conflicts or build issues. It looks like the PCI pieces here are all independent now and can go through Bjorn's tree instead of arm-soc. Or do you anticipate having something dependent on this later on such that we should take it? For 3.12 it was easier to take through arm-soc since this built on top of the other PCI/MSI work we were queueing. If you want us to take it, see if you can shake an ack out of Bjorn, mostly to make sure he's aware that there's PCI code going through our tree. -Olof
Hi! On Mon, Oct 07, 2013 at 10:02:06AM -0700, Olof Johansson wrote: > Hi Jason, > > On Mon, Sep 30, 2013 at 11:36:43AM -0400, Jason Cooper wrote: > > Guys, > > > > Here are all of the driver changes that didn't make it during the last > > merge window. They've been in -next since v3.12-rc1, without > > merge-conflicts or build issues. > > It looks like the PCI pieces here are all independent now and can go through > Bjorn's tree instead of arm-soc. Or do you anticipate having something > dependent on this later on such that we should take it? I chose to keep them on the same path as last window because of the dependency between the irqchip changes: 627dfcc irqchip: armada-370-xp: properly request resources 31f614e irqchip: armada-370-xp: implement MSI support which the pci/msi changes depend on. > For 3.12 it was easier to take through arm-soc since this built on top of the > other PCI/MSI work we were queueing. As well as the irqchip changes... > If you want us to take it, see if you can shake an ack out of Bjorn, mostly to > make sure he's aware that there's PCI code going through our tree. Here's a link to where Bjorn agreed to the strategy for this merge window: http://lkml.org/lkml/2013/9/27/474 hth, Jason.
Guys, Here are all of the driver changes that didn't make it during the last merge window. They've been in -next since v3.12-rc1, without merge-conflicts or build issues. thx, Jason. The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f: Linux 3.12-rc1 (2013-09-16 16:17:51 -0400) are available in the git repository at: git://git.infradead.org/linux-mvebu.git tags/drivers-3.13 for you to fetch changes up to cc54ccd9a6966708c00ebd8a08acc3e627a432c5: PCI: mvebu: add support for Marvell Dove SoCs (2013-09-30 14:58:47 +0000) ---------------------------------------------------------------- mvebu drivers changes for v3.13 - irqchip - add MSI support for armada-370/XP - pci - add MSI support - add support for Marvell Dove SoCs ---------------------------------------------------------------- Sebastian Hesselbarth (5): PCI: mvebu: move clock enable before register access PCI: mvebu: increment nports only for registered ports PCI: mvebu: remove subsys_initcall PCI: mvebu: add support for reset on GPIO PCI: mvebu: add support for Marvell Dove SoCs Thomas Petazzoni (3): irqchip: armada-370-xp: properly request resources irqchip: armada-370-xp: implement MSI support PCI: mvebu: add support for MSI .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 + .../devicetree/bindings/pci/mvebu-pci.txt | 10 + drivers/irqchip/irq-armada-370-xp.c | 202 ++++++++++++++++++++- drivers/pci/host/Kconfig | 2 +- drivers/pci/host/pci-mvebu.c | 121 ++++++++---- 5 files changed, 298 insertions(+), 40 deletions(-)