linux-kernel - Re: [GIT PULL] spi 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:41:56 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Mark Brown <broonie@...nel.org>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	linux-spi@...r.kernel.org
Subject: Re: [GIT PULL] spi fixes for v3.15

On Fri, Apr 11, 2014 at 3:56 AM, Mark Brown <broonie@...nel.org> wrote:
>
> Same issue as on the regulator pull request with the entire diffstat for
> the original pull request for this merge window has appeared - like I
> say I will try to fix the scripts as it's annoying and unclear.

Yeah, looking at this, the problem does seem to be that extraneous
merge. I'm not sure why you did that "Merge tag 'spi-v3.15' into
spi-linus" at all, but it basically acts as an indirect back-merge
giving you two different merge bases.

You seem to start your development by doing a merge of that tag that
you sent me. Why? Why not just start *at* the tag you sent me, not at
that extraneous merge of that tag and v3.14.

               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/