From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 21 Jun 2013 10:30:47 +0200 Subject: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC In-Reply-To: <20130621094723.312bc331@skate> References: <003901ce6e50$03d039a0$0b70ace0$@samsung.com> <201306210931.58428.arnd@arndb.de> <20130621094723.312bc331@skate> Message-ID: <201306211030.47440.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Friday 21 June 2013, Thomas Petazzoni wrote: > 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. Yes, good point. The alternative would be that Bjorn also takes the PCI branch dependencies that are already in arm-soc into his tree. Either way works, but I agree that what you suggest would be simpler. Arnd