linux-kernel - Re: Regulator updates for 3.3

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]

Message-ID: <20120110184530.GE7164@opensource.wolfsonmicro.com>
Date:	Tue, 10 Jan 2012 18:45:31 +0000
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Liam Girdwood <lrg@...com>, linux-kernel@...r.kernel.org
Subject: Re: Regulator updates for 3.3

On Tue, Jan 10, 2012 at 10:27:01AM -0800, Linus Torvalds wrote:

> Just don't do it. There's no excuse. The *only* time you should merge
> is when a sub lieutenant asks you to - and if you have people who work
> with you and ask you to do pointless merges almost every day, just
> tell them to shut the f*ck up already!

Hrm, OK.  These merges are all merges up of bug fixes for -rc from my
own tree into the development code which I tend to do constantly to make
it easier to work directly on the development branch.  What's the best
practice here - push things to you a bit more aggressively and wait
until you've tagged a -rc and then merge that back up into the
development branch?

> Do your development in a real branch, and do sane things in that real
> branch - like pulling from the people who work with you, but only when
> they ask, and only when they are ready.  And applying patches. But
> never *ever* have those stupid pointless "Merge remote-tracking branch
> 'regulator/for-linus' into regulator-next" in the branch you actually
> use for development, and the branch you send to me.

The -next branch is the branch used for development here unless there's
anything that's actually a topic that might want to get viewed
separately (like the device tree stuff this time), and all the merges
are from my own trees.  The reason they showed up as merges from remotes
is an oddity of my workflow here.
--
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/