Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753764Ab3IZPCn (ORCPT ); Thu, 26 Sep 2013 11:02:43 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:11784 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540Ab3IZPCi (ORCPT ); Thu, 26 Sep 2013 11:02:38 -0400 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX199D+gTT7lxKkakIMZBoliXCqYmmUjLhL0= Date: Thu, 26 Sep 2013 11:02:28 -0400 From: Jason Cooper To: Bjorn Helgaas Cc: Frank Li , Shawn Guo , Thomas Petazzoni , Jingoo Han , Thierry Reding , Andrew Lunn , Gregory Clement , Kevin Hilman , Stephen Warren , "linux-pci@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: PCI host merge strategy and maintainers Message-ID: <20130926150228.GL11119@titan.lakedaemon.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2939 Lines: 64 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/