Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756376Ab1FGTS2 (ORCPT ); Tue, 7 Jun 2011 15:18:28 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:45648 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756061Ab1FGTS1 (ORCPT ); Tue, 7 Jun 2011 15:18:27 -0400 Date: Tue, 7 Jun 2011 13:18:24 -0600 From: Grant Likely To: Mika Westerberg 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: <20110607191824.GA2035@ponder.secretlab.ca> References: <4b27fc93b7df900943e7c12084a8340cbc5fe1a8.1306662317.git.mika.westerberg@iki.fi> <20110603204400.GH17972@ponder.secretlab.ca> <20110607171403.GA3011@acer> <20110607190607.GB3011@acer> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110607190607.GB3011@acer> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1211 Lines: 26 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. g. -- 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/