mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: [GIT PULL] regulator fixes for v3.15
Date: Fri, 11 Apr 2014 22:53:02 +0100	[thread overview]
Message-ID: <20140411215302.GJ28800@sirena.org.uk> (raw)
In-Reply-To: <CA+55aFxGbTdk-0mRtrYCRLJ1X6hbbrmOvKpgupA+4X1Cpoj=OQ@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]

On Fri, Apr 11, 2014 at 01:32:59PM -0700, Linus Torvalds wrote:
> On Fri, Apr 11, 2014 at 1:30 PM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:

> > Not an immediate problem, but have you tested just adding a simple
> > "git fetch" from my repo to your scripts?

> Oh, actually, the problem may just be that back-merge you have. When
> those cause multiple merge bases, "git diff" can no longer reliably
> generate a diff, since there is no clear base for it. And then "git
> fetch" to update my current state won't likely help, since the problem
> isn't that you don't see my previous pull, the problem is that the
> base isn't unique any more.

Yeah, I'm pretty sure the problem is the actual back merge - the
shortlog is doing the right thing for example.  I did in fact have a
copy of your merge in my tree, that's how the shortlog turned out right
in this round of pull requests.  I just need to arrange not to have the
back merge either through being more sensible about what I ask you to
pull or by improving the scripts.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

      reply	other threads:[~2014-04-11 21:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-11 10:38 Mark Brown
2014-04-11 20:30 ` Linus Torvalds
2014-04-11 20:32   ` Linus Torvalds
2014-04-11 21:53     ` Mark Brown [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=20140411215302.GJ28800@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®