Re: [GIT PULL] 9p changes fro merge window

[Linus Torvalds]

On Wed, Oct 26, 2011 at 2:48 PM, Eric Van Hensbergen <ericvh@xxxxxxxxx> wrote:
>
> What's the preferred maintainer workflow?  I had been fetching and then rebasing, which seemed to keep my shortlog clean of merge commits and the outstanding patches towards the top.  Should I just be pulling from upstream and not caring about the merge commits?

Hell no.

Why do you pull from upstream? What does that add to *your*
development? Don't do it. Pick a place to start, and just develop
things. Ask me to pull.

No merge commits, no rebases, no nothing. JUST ACTUAL WORK. It also
keeps the history clean, and means that what people test (in
linux-next _and_ in your own internal testing) is actually what you
ask me to pull, rather than something else.

> Also, as a point of clarification, if I do get my kernel.org tree back, should I continue to sign tags for pull-requests or was that just for external repos like github?

Just for external repos on sites that have no other verification.

We may want to do the whole git-level signing for everything
eventually, but only if/when git makes it easy to sign the pull
request (and verify it). Until then, the "make a separate signature"
is just a way to avoid the "I have no idea who you are" issue.

                     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/