linux-kernel - Re: [RFC] to rebase or not to rebase on linux-next

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: <20091027075954.GA32640@elte.hu>
Date:	Tue, 27 Oct 2009 08:59:54 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	Sam Ravnborg <sam@...nborg.org>,
	LKML <linux-kernel@...r.kernel.org>,
	Nicolas Pitre <nico@...xnic.net>,
	"Luck, Tony" <tony.luck@...el.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	"Luis R. Rodriguez" <mcgrof@...il.com>,
	Jeff Garzik <jeff@...zik.org>,
	Robert Richter <robert.richter@....com>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	Jean Delvare <khali@...ux-fr.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: [RFC] to rebase or not to rebase on linux-next

* Steven Rostedt <rostedt@...dmis.org> wrote:

> On Fri, 2009-10-23 at 23:59 +0200, Sam Ravnborg wrote:
> > On Fri, Oct 23, 2009 at 10:54:00PM +0200, Ingo Molnar wrote:
> > > 
> > > Maintainer trees pushed towards linux-next should strive to be Git 
> > > based, append-mostly, 'nice', 'intended for upstream' and 
> > > defendable as-is IMO, and rebasing a _maintainer tree_ should 
> > > really be a rare act of last resort.
> > 
> > As maintainer I try to put some effort in crediting people where 
> > credit belongs. In other words collecting "Acked-by:", "Tested-by", 
> > "Reviewed-by".
> > 
> > Adding this require a rebase as soon as said patch hits git.
> 
> I've been saying for a while that git really needs a way to "annotate" 
> a commit. And have git log show those annotations by default. 
> Signed-off-by must be in the original commit. But Acked-by, Tested-by 
> and Reviewed-by almost always come after it hits some git repo.

For any reasonably complex change you simply need to wait a bit anyway 
to gather feedback. And for trivial/obvious/small patches it makes 
little sense to upset the Git history just to add the tags.

(And if there's frequent problems with small changes that were supposed 
to be easy you need to revisit the quality process.)

So no, the rewinding of published for-pull git trees are not fine in 
Linux. It's OK to post a declaredly RFC git tree with some 
to-be-reworked patches in it - but it's not OK to publish a git tree for 
pull and rebase it after that. You'll certainly see me complain if you 
do that (and Linus will complain to me if i do that).

Now with tip:tracing/core we sometimes ran into a situaton where we did 
rebases to make the tree fast-forward all the time - but that's not 
necessary as Linus has made it clear that the occasional merge commit is 
not a problem. (if the mechanism to remove them is to rebase) We can 
certainly do that to make the Git flow even more append-only.

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