[PATCH v2 5/5] spi/ep93xx: add DMA support
mika.westerberg at iki.fi
Tue Jun 7 15:06:07 EDT 2011
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 at 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
More information about the linux-arm-kernel