From: "Koul, Vinod" <vinod.koul@intel.com>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: Mika Westerberg <mika.westerberg@iki.fi>,
linux-arm-kernel@lists.infradead.org,
hsweeten@visionengravers.com, rmallon@gmail.com,
dan.j.williams@intel.com, lrg@ti.com,
broonie@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 5/5] spi/ep93xx: add DMA support
Date: Wed, 08 Jun 2011 09:28:32 +0530 [thread overview]
Message-ID: <1307505512.10976.91.camel@vkoul-udesk3> (raw)
In-Reply-To: <20110607194034.GC2035@ponder.secretlab.ca>
On Tue, 2011-06-07 at 13:40 -0600, Grant Likely wrote:
> On Tue, Jun 07, 2011 at 10:29:45PM +0300, Mika Westerberg wrote:
> > On Tue, Jun 07, 2011 at 01:18:24PM -0600, Grant Likely wrote:
> > > On Tue, Jun 07, 2011 at 10:06:07PM +0300, Mika Westerberg wrote:
> > > > On Tue, Jun 07, 2011 at 12:45:26PM -0600, Grant Likely wrote:
> > > > > On Tue, Jun 7, 2011 at 11:14 AM, Mika Westerberg <mika.westerberg@iki.fi> wrote:
> > > > > >
> > > > > > I just realized that once the SPI driver renaming patch (spi: reorganize
> > > > > > drivers) enters linux-next, this patch (which sits on Vinod's tree) will cause
> > > > > > a merge conflict. Any ideas how to avoid it beforehand?
> > > > >
> > > > > Yes, put the whole series into a separate branch all by itself. Merge
> > > > > that branch into Vinod's tree and I'll also merge it into spi/next,
> > > > > and I'll fix up the merge conflict when I do.
> > > >
> > > > More stupid questions: Do you mean that I create a branch in my public
> > > > repository somewhere? If that is the case, then there is a problem that I
> > > > don't have any public repository and I doubt that I get such before linux-next
> > > > is rebuilt.
> > >
> > > It doesn't have to be your repo. Vinod could do it, or I could.
> >
> > Ah, I see.
> >
> > Would it then be possible that you could do it? Please let me and Vinod know
> > what is needed from us.
> >
> > And sorry for this mess.
>
> I'll need an ack from Vinod first for the series so that I can add it
> before I make the commits, but other than that I have no problem doing
> so.
Acked-by: Vinod Koul <vinod.koul@intel.com>
Let me know which branch you have pushed and I will merge that to my
tree
--
~Vinod
next prev parent reply other threads:[~2011-06-08 4:33 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-29 10:10 [PATCH v2 0/5] ep93xx DMA patches Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 1/5] dmaengine: add ep93xx DMA support Mika Westerberg
2011-11-15 15:02 ` Rafal Prylowski
2011-11-15 17:59 ` H Hartley Sweeten
2011-11-16 6:48 ` Mika Westerberg
2011-11-16 9:00 ` Rafal Prylowski
2011-11-16 6:55 ` Mika Westerberg
2011-11-16 8:31 ` Rafal Prylowski
2011-11-19 12:38 ` Mika Westerberg
2011-11-21 7:44 ` Rafal Prylowski
2011-11-21 8:01 ` Mika Westerberg
2011-11-21 8:32 ` Vinod Koul
2011-11-22 5:59 ` Mika Westerberg
2011-11-23 10:47 ` Vinod Koul
2011-11-21 8:54 ` Rafal Prylowski
2011-11-22 6:47 ` Mika Westerberg
2011-11-22 8:45 ` Rafal Prylowski
2011-05-29 10:10 ` [PATCH v2 2/5] ep93xx: add dmaengine platform code Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 3/5] ASoC: ep93xx: convert to use the DMA engine API Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 4/5] ep93xx: remove the old M2P DMA code Mika Westerberg
2011-05-29 10:10 ` [PATCH v2 5/5] spi/ep93xx: add DMA support Mika Westerberg
2011-06-03 20:44 ` Grant Likely
2011-06-07 17:14 ` Mika Westerberg
2011-06-07 18:45 ` Grant Likely
2011-06-07 19:06 ` Mika Westerberg
2011-06-07 19:18 ` Grant Likely
2011-06-07 19:29 ` Mika Westerberg
2011-06-07 19:40 ` Grant Likely
2011-06-08 3:58 ` Koul, Vinod [this message]
2011-06-08 21:53 ` Grant Likely
2011-06-09 16:42 ` Koul, Vinod
2011-06-09 18:46 ` Grant Likely
2011-06-09 19:15 ` Mika Westerberg
2011-06-05 8:19 ` [PATCH v2 0/5] ep93xx DMA patches Mika Westerberg
2011-06-06 6:39 ` Koul, Vinod
2011-06-06 16:42 ` Mika Westerberg
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=1307505512.10976.91.camel@vkoul-udesk3 \
--to=vinod.koul@intel.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dan.j.williams@intel.com \
--cc=grant.likely@secretlab.ca \
--cc=hsweeten@visionengravers.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=mika.westerberg@iki.fi \
--cc=rmallon@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).