From mboxrd@z Thu Jan 1 00:00:00 1970 From: vinod.koul@intel.com (Koul, Vinod) Date: Wed, 08 Jun 2011 09:28:32 +0530 Subject: [PATCH v2 5/5] spi/ep93xx: add DMA support In-Reply-To: <20110607194034.GC2035@ponder.secretlab.ca> References: <4b27fc93b7df900943e7c12084a8340cbc5fe1a8.1306662317.git.mika.westerberg@iki.fi> <20110603204400.GH17972@ponder.secretlab.ca> <20110607171403.GA3011@acer> <20110607190607.GB3011@acer> <20110607191824.GA2035@ponder.secretlab.ca> <20110607192945.GC3011@acer> <20110607194034.GC2035@ponder.secretlab.ca> Message-ID: <1307505512.10976.91.camel@vkoul-udesk3> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 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 Let me know which branch you have pushed and I will merge that to my tree -- ~Vinod