linux-kernel - Re: [GIT PULL] regulator fixes for v3.15

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 11 Apr 2014 13:32:59 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Mark Brown <broonie@...nel.org>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Liam Girdwood <lgirdwood@...il.com>
Subject: Re: [GIT PULL] regulator fixes for v3.15

On Fri, Apr 11, 2014 at 1:30 PM, Linus Torvalds
<torvalds@...ux-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.

              Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/