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

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFwHw=xSdk7VtHCiVKzfzvGS=d8hXwwfaPEcU=P6PDarsA@mail.gmail.com>
Date:	Wed, 26 Oct 2011 14:58:15 +0200
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Eric Van Hensbergen <ericvh@...il.com>
Cc:	V9FS Developers <v9fs-developer@...ts.sourceforge.net>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] 9p changes fro merge window

On Wed, Oct 26, 2011 at 2:48 PM, Eric Van Hensbergen <ericvh@...il.com> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/