All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Subject: Re: [PATCH v2] ASoC: Fix kerneldoc errors
Date: Sun, 16 Nov 2014 15:58:39 +0100	[thread overview]
Message-ID: <s5hd28nmbts.wl-tiwai@suse.de> (raw)
In-Reply-To: <20141116144635.GO3815@sirena.org.uk>

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

      reply	other threads:[~2014-11-16 14:58 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-10 20:47 [PATCH v2] ASoC: Fix kerneldoc errors Takashi Iwai
2014-11-14 12:57 ` Mark Brown
2014-11-14 17:29   ` Mark Brown
2014-11-16  8:40     ` Takashi Iwai
2014-11-16 11:06       ` Mark Brown
2014-11-16 12:10         ` Takashi Iwai
2014-11-16 14:46           ` Mark Brown
2014-11-16 14:58             ` Takashi Iwai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5hd28nmbts.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.