From: Jason Cooper <jason@lakedaemon.net>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Frank Li <lznuaa@gmail.com>, Shawn Guo <shawn.guo@linaro.org>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Jingoo Han <jg1.han@samsung.com>,
Thierry Reding <thierry.reding@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@free-electrons.com>,
Kevin Hilman <khilman@linaro.org>,
Stephen Warren <swarren@nvidia.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: PCI host merge strategy and maintainers
Date: Thu, 26 Sep 2013 11:02:28 -0400 [thread overview]
Message-ID: <20130926150228.GL11119@titan.lakedaemon.net> (raw)
In-Reply-To: <CAErSpo7UX6dt0CPZp3kEQrXXbMeArpu1iFfp=-FX46LVgq0iMw@mail.gmail.com>
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.
next prev parent reply other threads:[~2013-09-26 15:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 23:28 PCI host merge strategy and maintainers Bjorn Helgaas
2013-09-26 2:32 ` Shawn Guo
2013-09-26 15:02 ` Jason Cooper [this message]
2013-09-27 18:58 ` Bjorn Helgaas
2013-09-27 19:19 ` Frank Li
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=20130926150228.GL11119@titan.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=andrew@lunn.ch \
--cc=bhelgaas@google.com \
--cc=gregory.clement@free-electrons.com \
--cc=jg1.han@samsung.com \
--cc=khilman@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lznuaa@gmail.com \
--cc=shawn.guo@linaro.org \
--cc=swarren@nvidia.com \
--cc=thierry.reding@gmail.com \
--cc=thomas.petazzoni@free-electrons.com \
/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;
as well as URLs for NNTP newsgroup(s).