There are patches for exynos, imx6, mvebu, and tegra on the PCI list,
and I want to sort out how people expect them to be merged.
My current assumption is the following:
drivers/pci/host/pcie-designware.c via PCI tree since I applied
recent changes
drivers/pci/host/pci-exynos.c via PCI tree since I applied recent changes
drivers/pci/host/pci-imx6.c via Shawn Guo per [1]
drivers/pci/host/pci-mvebu.c ?? unclear; Jason Cooper has merged
some, I've merged some
drivers/pci/host/pci-tegra.c via PCI tree per Stephen Warren [2]
Please correct anything that's wrong above, and please give me some
guidance on mvebu. I'm happy to go either way; I just need to know
whether to pay attention to them :)
In addition, since I don't have time, expertise, or hardware to really
review changes to these drivers, I'd like to have them acked by people
who do. My current assumption is that these are the right people:
designware: Jingoo Han <[email protected]>
exynos: Jingoo Han <[email protected]>
imx6: Shawn Guo <[email protected]>
mvebu: Jason Cooper <[email protected]>, Andrew Lunn
<[email protected]>, Gregory Clement <[email protected]>
tegra: Thierry Reding <[email protected]>
Again, please correct anything that's wrong. My plan is that I won't
apply patches to these drivers unless they're acked by the folks
above.
Bjorn
[1] http://lkml.kernel.org/r/[email protected]
[2] http://lkml.kernel.org/r/[email protected]
Hi Bjorn,
On Wed, Sep 25, 2013 at 05:28:28PM -0600, Bjorn Helgaas wrote:
> There are patches for exynos, imx6, mvebu, and tegra on the PCI list,
> and I want to sort out how people expect them to be merged.
>
> My current assumption is the following:
>
> drivers/pci/host/pcie-designware.c via PCI tree since I applied
> recent changes
> drivers/pci/host/pci-exynos.c via PCI tree since I applied recent changes
> drivers/pci/host/pci-imx6.c via Shawn Guo per [1]
A second thought on that. I would split the patch for better separation
between driver and arch parts, so that they can go through PCI and
arm-soc tree separately without worrying about merge conflict later.
I will send you patches that we expect to go via your tree in a few
minutes.
Shawn
> drivers/pci/host/pci-mvebu.c ?? unclear; Jason Cooper has merged
> some, I've merged some
> drivers/pci/host/pci-tegra.c via PCI tree per Stephen Warren [2]
>
> Please correct anything that's wrong above, and please give me some
> guidance on mvebu. I'm happy to go either way; I just need to know
> whether to pay attention to them :)
>
> In addition, since I don't have time, expertise, or hardware to really
> review changes to these drivers, I'd like to have them acked by people
> who do. My current assumption is that these are the right people:
>
> designware: Jingoo Han <[email protected]>
> exynos: Jingoo Han <[email protected]>
> imx6: Shawn Guo <[email protected]>
> mvebu: Jason Cooper <[email protected]>, Andrew Lunn
> <[email protected]>, Gregory Clement <[email protected]>
> tegra: Thierry Reding <[email protected]>
>
> Again, please correct anything that's wrong. My plan is that I won't
> apply patches to these drivers unless they're acked by the folks
> above.
>
> Bjorn
>
>
> [1] http://lkml.kernel.org/r/[email protected]
> [2] http://lkml.kernel.org/r/[email protected]
On Wed, Sep 25, 2013 at 05:28:28PM -0600, Bjorn Helgaas wrote:
> There are patches for exynos, imx6, mvebu, and tegra on the PCI list,
> and I want to sort out how people expect them to be merged.
>
> My current assumption is the following:
...
> drivers/pci/host/pci-mvebu.c ?? unclear; Jason Cooper has merged
> some, I've merged some
hmm, my current branch I'm about to send a pull for, mvebu/msi_mvebu has
the following diffstat:
.../devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 +
.../devicetree/bindings/pci/mvebu-pci.txt | 3 +
arch/arm/boot/dts/armada-370-xp.dtsi | 1 +
arch/arm/boot/dts/armada-370.dtsi | 1 +
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 +
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 +
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 +
drivers/irqchip/irq-armada-370-xp.c | 202 ++++++++++++++++++++-
drivers/pci/host/pci-mvebu.c | 26 +++
9 files changed, 234 insertions(+), 5 deletions(-)
The problematic piece is the build dep on the irqchip changes. It was
ok for me to take them through my tree last time, I assume that's the
case this time.
One thing you didn't mention are the dove changes which (of course)
depend on Thomas' mvebu changes above. They are currently in
mvebu/dove_pcie-mbus-dt and has the following diffstat:
.../devicetree/bindings/pci/mvebu-pci.txt | 7 +
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/dove-cm-a510.dts | 2 +-
arch/arm/boot/dts/dove-cubox.dts | 2 +-
arch/arm/boot/dts/dove-d2plug.dts | 2 +-
arch/arm/boot/dts/dove-d3plug.dts | 103 ++
arch/arm/boot/dts/dove-dove-db.dts | 2 +-
arch/arm/boot/dts/dove.dtsi | 1009 +++++++++++---------
arch/arm/mach-dove/board-dt.c | 39 +-
drivers/pci/host/Kconfig | 2 +-
drivers/pci/host/pci-mvebu.c | 99 +-
11 files changed, 719 insertions(+), 549 deletions(-)
Both series were intended for the last merge window, but didn't make it.
So they've had plenty of time in -next. I've not seen any merge
conflicts either, but I haven't followed how early everyone else starts
posting to -next.
> Please correct anything that's wrong above, and please give me some
> guidance on mvebu. I'm happy to go either way; I just need to know
> whether to pay attention to them :)
Well, there's nothing new here, so if you're ok with me taking them,
I'll continue on that path for these two series.
thx,
Jason.
On Thu, Sep 26, 2013 at 9:02 AM, Jason Cooper <[email protected]> wrote:
> On Wed, Sep 25, 2013 at 05:28:28PM -0600, Bjorn Helgaas wrote:
>> There are patches for exynos, imx6, mvebu, and tegra on the PCI list,
>> and I want to sort out how people expect them to be merged.
>>
>> My current assumption is the following:
> ...
>> drivers/pci/host/pci-mvebu.c ?? unclear; Jason Cooper has merged
>> some, I've merged some
...
> Well, there's nothing new here, so if you're ok with me taking them,
> I'll continue on that path for these two series.
OK, I'll assume Jason will take care of pci-mvebu.c, and I will merge
changes to everything else via the PCI tree. I will still wait for
acks from the following before merging things:
designware: Jingoo Han <[email protected]>
exynos: Jingoo Han <[email protected]>
imx6: Shawn Guo <[email protected]>
tegra: Thierry Reding <[email protected]>
Bjorn
> OK, I'll assume Jason will take care of pci-mvebu.c, and I will merge
> changes to everything else via the PCI tree. I will still wait for
> acks from the following before merging things:
>
> designware: Jingoo Han <[email protected]>
> exynos: Jingoo Han <[email protected]>
> imx6: Shawn Guo <[email protected]>
Shawn already acked and send out v7 version.
best regards
Frank Li
> tegra: Thierry Reding <[email protected]>
>
> Bjorn