[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-id: <007201ce7085$d2c4fed0$784efc70$@samsung.com>
Date: Mon, 24 Jun 2013 11:52:10 +0900
From: Jingoo Han <jg1.han@...sung.com>
To: 'Bjorn Helgaas' <bhelgaas@...gle.com>,
'Thomas Petazzoni' <thomas.petazzoni@...e-electrons.com>
Cc: 'Arnd Bergmann' <arnd@...db.de>,
'Jason Cooper' <jason@...edaemon.net>,
'Kukjin Kim' <kgene.kim@...sung.com>,
linux-samsung-soc@...r.kernel.org, linux-pci@...r.kernel.org,
devicetree-discuss@...ts.ozlabs.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
'Grant Likely' <grant.likely@...retlab.ca>,
'Andrew Murray' <andrew.murray@....com>,
'Thierry Reding' <thierry.reding@...onic-design.de>,
'Jason Gunthorpe' <jgunthorpe@...idianresearch.com>,
'Surendranath Gurivireddy Balla' <suren.reddy@...sung.com>,
'Siva Reddy Kallam' <siva.kallam@...sung.com>,
'Thomas Abraham' <thomas.abraham@...aro.org>,
'Tomasz Figa' <t.figa@...sung.com>,
'Pratyush Anand' <pratyush.anand@...com>,
'Mohit KUMAR' <Mohit.KUMAR@...com>,
Jingoo Han <jg1.han@...sung.com>
Subject: Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
On Friday, June 21, 2013 11:15 PM, Arnd Bergmann wrote:
> 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, right.
That is the reason why I based on 'linu-next' tree,
instead of 'PCI' -next branch.
Bjorn Helgaas,
Could you give your ACK?
Thank you.
Best regards,
Jingoo Han
> > >
> > > 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists