From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: [PATCH v2] ASoC: Fix kerneldoc errors
Date: Sun, 16 Nov 2014 15:58:39 +0100
Message-ID: <s5hd28nmbts.wl-tiwai@suse.de>
References: <1415652427-827-1-git-send-email-tiwai@suse.de>
 <20141114125704.GA3815@sirena.org.uk>
 <20141114172924.GJ3815@sirena.org.uk>
 <s5hbno7o7wo.wl-tiwai@suse.de>
 <20141116110647.GN3815@sirena.org.uk>
 <s5hy4rbmjm6.wl-tiwai@suse.de>
 <20141116144635.GO3815@sirena.org.uk>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15])
 by alsa0.perex.cz (Postfix) with ESMTP id 7ABD026071B
 for <alsa-devel@alsa-project.org>; Sun, 16 Nov 2014 15:58:40 +0100 (CET)
In-Reply-To: <20141116144635.GO3815@sirena.org.uk>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
To: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
List-Id: alsa-devel@alsa-project.org

At Sun, 16 Nov 2014 14:46:35 +0000,
Mark Brown wrote:
> 
> On Sun, Nov 16, 2014 at 01:10:25PM +0100, Takashi Iwai wrote:
> > Mark Brown wrote:
> 
> > > One of the reasons I don't do that is that you don't have a branch which
> > > tracks Linus' tree merged into your own while I do track Linus' tree so
> > > once I've sent a pull request to you and another -rc has come out git
> > > has trouble constructing a sensible pull request, either the diffstat is
> > > bogus or the changelog is and I use both when reviewing what I'm
> > > sending.
> 
> > Hm, but this does happen even if you send once, doesn't it?
> 
> No, I just send my pull request against Linus' tree.  That just shows my
> changes which is fine.  Then if I want to send a further request I
> either use his tree again and get all the previous changes included in
> the request or I use your tree and get everything in Linus' tree since
> -rc1.  Either way it's hard to keep track.
> 
> > If you need the merge of Linus tree beforehand, just let me know.
> > I must review what I'm pulling, of course, so your demand is my
> > demand, too.
> 
> It would help a lot to get a branch that's merged with the -rcs.  I base
> all my merges off Linus' latest release since there's no sense testing
> without the latest bug fixes and this helps track what fixes still need
> to go.

OK, I'll merge Linus tree regularly to my master branch, which has
already contain all my changes.  You can send a pull request against
it.


Takashi