From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from moutng.kundenserver.de ([212.227.126.171]:50355 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422679Ab3FUOQM (ORCPT ); Fri, 21 Jun 2013 10:16:12 -0400 From: Arnd Bergmann To: Jason Cooper Subject: Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC Date: Fri, 21 Jun 2013 16:14:49 +0200 Cc: Thomas Petazzoni , 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'" References: <003901ce6e50$03d039a0$0b70ace0$@samsung.com> <201306211030.47440.arnd@arndb.de> <20130621141144.GP31667@titan.lakedaemon.net> In-Reply-To: <20130621141144.GP31667@titan.lakedaemon.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Message-Id: <201306211614.49434.arnd@arndb.de> Sender: linux-pci-owner@vger.kernel.org List-ID: On Friday 21 June 2013, Jason Cooper wrote: > On Fri, Jun 21, 2013 at 10:30:47AM +0200, Arnd Bergmann wrote: > > 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. > > Yes, that is why we did it this way. It was my understanding based on > previous comments by yourself and LinusW that you both had patches > depending on (now called) mvebu/of_pci. So we got it into arm-soc > early so those branches could depend on it. Right. I wasn't paying enough attention for the early merges that Olof did. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC Date: Fri, 21 Jun 2013 16:14:49 +0200 Message-ID: <201306211614.49434.arnd@arndb.de> References: <003901ce6e50$03d039a0$0b70ace0$@samsung.com> <201306211030.47440.arnd@arndb.de> <20130621141144.GP31667@titan.lakedaemon.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130621141144.GP31667@titan.lakedaemon.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Jason Cooper Cc: Thomas Petazzoni , 'Jason Gunthorpe' , 'Kukjin Kim' , 'Siva Reddy Kallam' , 'Surendranath Gurivireddy Balla' , linux-pci@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Jingoo Han , linux-kernel@vger.kernel.org, 'Grant Likely' , linux-samsung-soc@vger.kernel.org, 'Thomas Abraham' , 'Mohit KUMAR' , 'Bjorn Helgaas' , 'Andrew Murray' , 'Pratyush Anand' , 'Thierry Reding' , 'Tomasz Figa' , linux-arm-kernel@lists.infradead.org List-Id: linux-samsung-soc@vger.kernel.org On Friday 21 June 2013, Jason Cooper wrote: > On Fri, Jun 21, 2013 at 10:30:47AM +0200, Arnd Bergmann wrote: > > 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. > > Yes, that is why we did it this way. It was my understanding based on > previous comments by yourself and LinusW that you both had patches > depending on (now called) mvebu/of_pci. So we got it into arm-soc > early so those branches could depend on it. Right. I wasn't paying enough attention for the early merges that Olof did. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Fri, 21 Jun 2013 16:14:49 +0200 Subject: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC In-Reply-To: <20130621141144.GP31667@titan.lakedaemon.net> References: <003901ce6e50$03d039a0$0b70ace0$@samsung.com> <201306211030.47440.arnd@arndb.de> <20130621141144.GP31667@titan.lakedaemon.net> Message-ID: <201306211614.49434.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Friday 21 June 2013, Jason Cooper wrote: > On Fri, Jun 21, 2013 at 10:30:47AM +0200, Arnd Bergmann wrote: > > 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. > > Yes, that is why we did it this way. It was my understanding based on > previous comments by yourself and LinusW that you both had patches > depending on (now called) mvebu/of_pci. So we got it into arm-soc > early so those branches could depend on it. Right. I wasn't paying enough attention for the early merges that Olof did. Arnd