Re: Regulator updates for 3.3

[Linus Torvalds]

On Sun, Jan 8, 2012 at 11:37 PM, Mark Brown
<broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote:
> Please pull from the tree below to merge regulator API updates for
> version 3.3  The major update here is the addition of device tree
> support by Rajendra Nayak, and we also have a new driver for the
> regulators on the DA9052 PMIC.  Otherwise most of the changes are
> bug fixes and cleanups of one form or another.

Mark, I pulled this, but I was *this* close to unpulling it because
it's such an unholy mess.

You seem to do the crazy "daily pull" crap that NOBODY IS EVER SUPPOSED TO DO.

There are lots of totally pointless

   Merge remote-tracking branch 'regulator/for-linus' into regulator-next

merge commits, and no, that's not ok. It makes the history really hard
to read, and has some bad practical impact outside of that
visualization issue too (bisection becomes slower and much more of a
pain, for example).

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!

If you want to have a special linux-next branch that you want to merge
crap into (for linux-next), go right ahead. But dammit, don't then do
development on top of that kind of crap - use that branch *only* for
linux-next, not for anything else, and don't ask me to pull that
polluted piece of sh*t.

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.

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