linux-kernel - Re: linux-next: current pending merge fix patches

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]

Date:	Mon, 1 Mar 2010 09:56:13 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus <torvalds@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>, linux-next@...r.kernel.org,
	Len Brown <lenb@...nel.org>, Dave Jones <davej@...hat.com>,
	Jean Delvare <khali@...ux-fr.org>, Greg KH <greg@...ah.com>,
	"J. Bruce Fields" <bfields@...ldses.org>,
	Trond Myklebust <trond.myklebust@....uio.no>,
	Sage Weil <sage@...dream.net>,
	Pekka Enberg <penberg@...helsinki.fi>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Tejun Heo <tj@...nel.org>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Al Viro <viro@...IV.linux.org.uk>,
	J??rn Engel <joern@...fs.org>
Subject: Re: linux-next: current pending merge fix patches

* Ingo Molnar <mingo@...e.hu> wrote:

> So i'd argue to not backmerge during the merge window (and i have stopped 
> doing that myself a few cycles ago, and it clearly helped things) - but in 
> any case it's certainly no big deal and up to Linus i guess.

What i do instead is that once Linus pulls from me i pull back immediately to 
test, and if it's fine i base further subsystem patches on that and test the 
heck out of the combination from that point on.

That's the collective 'point of no looking back' when subsystem people should 
jump in and help out testing the "final" combination.

But if a subsystem tree backmerges during the merge window any sooner 
(_before_ Linus pulls), it can cause criss-cross merges (as Linus may not pull 
or may pull later during which fixes arrive, etc.), creating a less readable 
history, etc. - which may make integration and problem isolation somewhat 
harder in the end.

( It's not a big deal in isolation and i dont think Linus actually rejects
  trees that do the occasional backmerge - but the combination of many small
  deals can have a bigger effect. )

There are exceptions, such as tricky conflicts that i know to be problematic - 
in that case i occasionally backmerge. But it's relatively rare - 90%+ of the 
conflicts are trivial and all-or-nothing affairs (i.e. if you mess it up the 
kernel wont work very well, so it's immediately noticeable).

Thanks,

	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/