Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423204Ab3FUHrd (ORCPT ); Fri, 21 Jun 2013 03:47:33 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:53317 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423034Ab3FUHrb (ORCPT ); Fri, 21 Jun 2013 03:47:31 -0400 Date: Fri, 21 Jun 2013 09:47:23 +0200 From: Thomas Petazzoni To: Arnd Bergmann Cc: Jingoo Han , "'Kukjin Kim'" , "'Bjorn Helgaas'" , linux-samsung-soc@vger.kernel.org, linux-pci@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "'Grant Likely'" , "'Andrew Murray'" , "'Thierry Reding'" , "'Jason Gunthorpe'" , "'Surendranath Gurivireddy Balla'" , "'Siva Reddy Kallam'" , "'Thomas Abraham'" , "'Tomasz Figa'" , "'Pratyush Anand'" , "'Mohit KUMAR'" , Jason Cooper Subject: Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC Message-ID: <20130621094723.312bc331@skate> In-Reply-To: <201306210931.58428.arnd@arndb.de> References: <003901ce6e50$03d039a0$0b70ace0$@samsung.com> <201306210931.58428.arnd@arndb.de> Organization: Free Electrons X-Mailer: Claws Mail 3.9.1 (GTK+ 2.24.17; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 44 Dear Arnd Bergmann, On Fri, 21 Jun 2013 09:31:58 +0200, Arnd Bergmann wrote: > Bjorn, are you still considering to merge this for 3.11 or have you > closed your tree for the merge window? I think it would be good to get > it in. Note that the of/pci changes needed for this driver are merged through the arm-soc tree, with the of maintainers ACKs. They are already in arm-soc for-next, through Jason Cooper's tree. 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090 of/pci: Add of_pci_parse_bus_range() function 45ab9702fb47d18dca116b3a0509efa19fbcb27a of/pci: Add of_pci_get_devfn() function 29b635c00f3ebcdaf7a52c4948f6d948ad3757d3 of/pci: Provide support for parsing PCI DT ranges property Also, it depends on the Marvell PCIe driver (but to a lesser extent), which is the one that creates the drivers/pci/host/Kconfig and drivers/pci/host/Makefile. 45361a4fe4464180815157654aabbd2afb4848ad pci: PCIe driver for Marvell Armada 370/XP systems I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. I'll let you discuss that with Jason Cooper. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- 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/