linux-kernel - Re: [GIT PULL] regulator updates for v3.13-rc1

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] [day] [month] [year] [list]

Date:	Thu, 23 Jan 2014 16:04:56 -0800
From:	"H. Peter Anvin" <hpa@...or.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>,
	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 updates for v3.13-rc1

On 01/21/2014 11:16 AM, Linus Torvalds wrote:
> On Mon, Nov 25, 2013 at 4:39 PM, Mark Brown <broonie@...nel.org> wrote:
>>
>> If you're OK with octopus merges for things like this I'll definitely
>> take another look at using them, the enormous stack of merge commits
>> always looks noisy to me in the logs and pull requests and for things
>> like driver updates there's unlikely to be much doubt about which branch
>> it was if there's a problem.
> 
> Christ. When you start doing octopus merges, you don't do it by half
> measures, do you?
> 
> I just pulled the sound updates from Takashi, and as a result got your
> merge commit 2cde51fbd0f3. That one has 66 parents.
> 

For sheer amusement value: the tip-bot uses a private git tree to keep
track of what it has mailed and not mailed.  At least once it produced a
243-input octopus merge.

	-hpa


--
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/