From: Arnd Bergmann <arnd@arndb.de>
To: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Jingoo Han <jg1.han@samsung.com>,
"'Kukjin Kim'" <kgene.kim@samsung.com>,
"'Bjorn Helgaas'" <bhelgaas@google.com>,
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'" <grant.likely@secretlab.ca>,
"'Andrew Murray'" <andrew.murray@arm.com>,
"'Thierry Reding'" <thierry.reding@avionic-design.de>,
"'Jason Gunthorpe'" <jgunthorpe@obsidianresearch.com>,
"'Surendranath Gurivireddy Balla'" <suren.reddy@samsung.com>,
"'Siva Reddy Kallam'" <siva.kallam@samsung.com>,
"'Thomas Abraham'" <thomas.abraham@linaro.org>,
"'Tomasz Figa'" <t.figa@samsung.com>,
"'Pratyush Anand'" <pratyush.anand@st.com>,
"'Mohit KUMAR'" <Mohit.KUMAR@st.com>
Subject: Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
Date: Fri, 21 Jun 2013 16:14:49 +0200 [thread overview]
Message-ID: <201306211614.49434.arnd@arndb.de> (raw)
In-Reply-To: <20130621141144.GP31667@titan.lakedaemon.net>
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
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
'Jason Gunthorpe' <jgunthorpe@obsidianresearch.com>,
'Kukjin Kim' <kgene.kim@samsung.com>,
'Siva Reddy Kallam' <siva.kallam@samsung.com>,
'Surendranath Gurivireddy Balla' <suren.reddy@samsung.com>,
linux-pci@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
Jingoo Han <jg1.han@samsung.com>,
linux-kernel@vger.kernel.org,
'Grant Likely' <grant.likely@secretlab.ca>,
linux-samsung-soc@vger.kernel.org,
'Thomas Abraham' <thomas.abraham@linaro.org>,
'Mohit KUMAR' <Mohit.KUMAR@st.com>,
'Bjorn Helgaas' <bhelgaas@google.com>,
'Andrew Murray' <andrew.murray@arm.com>,
'Pratyush Anand' <pratyush.anand@st.com>,
'Thierry Reding' <thierry.reding@avionic-design.de>,
'Tomasz Figa' <t.figa@samsung.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
Date: Fri, 21 Jun 2013 16:14:49 +0200 [thread overview]
Message-ID: <201306211614.49434.arnd@arndb.de> (raw)
In-Reply-To: <20130621141144.GP31667@titan.lakedaemon.net>
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
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
Date: Fri, 21 Jun 2013 16:14:49 +0200 [thread overview]
Message-ID: <201306211614.49434.arnd@arndb.de> (raw)
In-Reply-To: <20130621141144.GP31667@titan.lakedaemon.net>
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
next prev parent reply other threads:[~2013-06-21 14:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 7:21 [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC Jingoo Han
2013-06-21 7:21 ` Jingoo Han
2013-06-21 7:31 ` Arnd Bergmann
2013-06-21 7:31 ` Arnd Bergmann
2013-06-21 7:31 ` Arnd Bergmann
2013-06-21 7:47 ` Thomas Petazzoni
2013-06-21 7:47 ` Thomas Petazzoni
2013-06-21 8:30 ` Arnd Bergmann
2013-06-21 8:30 ` Arnd Bergmann
2013-06-21 14:11 ` Jason Cooper
2013-06-21 14:11 ` Jason Cooper
2013-06-21 14:11 ` Jason Cooper
2013-06-21 14:14 ` Arnd Bergmann [this message]
2013-06-21 14:14 ` Arnd Bergmann
2013-06-21 14:14 ` Arnd Bergmann
2013-06-24 2:52 ` Jingoo Han
2013-06-24 2:52 ` Jingoo Han
2013-06-24 2:52 ` Jingoo Han
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201306211614.49434.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=Mohit.KUMAR@st.com \
--cc=andrew.murray@arm.com \
--cc=bhelgaas@google.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jason@lakedaemon.net \
--cc=jg1.han@samsung.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=pratyush.anand@st.com \
--cc=siva.kallam@samsung.com \
--cc=suren.reddy@samsung.com \
--cc=t.figa@samsung.com \
--cc=thierry.reding@avionic-design.de \
--cc=thomas.abraham@linaro.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.