DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=sender:date:from:to:cc:subject:message-id:references:mime-version
         :content-type:content-disposition:in-reply-to:user-agent;
        b=NHlHX6SCpChojpX8fhwTLmG8Iz0i274vK2FmiZDf128ajBrFsmNLA47XF5ncS7vlhm
         GN0TpYqt66FBYwEGzDDJkwoEH5PRi8jJFKO119gbiMkBE2ln9hd+vrvjm6T39znshZPU
         y0KizapXMFdNicBOJqiZ0efCnkiUNFO+RTK3s=
Date: Tue, 7 Jun 2011 22:29:45 +0300
From: Mika Westerberg <mika.westerberg@iki.fi>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-arm-kernel@lists.infradead.org, hsweeten@visionengravers.com,
        rmallon@gmail.com, vinod.koul@intel.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
Message-ID: <20110607192945.GC3011@acer>
References: <cover.1306662317.git.mika.westerberg@iki.fi>
 <4b27fc93b7df900943e7c12084a8340cbc5fe1a8.1306662317.git.mika.westerberg@iki.fi>
 <20110603204400.GH17972@ponder.secretlab.ca>
 <20110607171403.GA3011@acer>
 <BANLkTikKOcc2Vg1p3kG4ZSLjJ0RTZWS=2A@mail.gmail.com>
 <20110607190607.GB3011@acer>
 <20110607191824.GA2035@ponder.secretlab.ca>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20110607191824.GA2035@ponder.secretlab.ca>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1444
Lines: 31

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/