From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linus <torvalds@linux-foundation•org>,
LKML <linux-kernel@vger•kernel.org>,
linux-next@vger•kernel.org, Len Brown <lenb@kernel•org>,
Dave Jones <davej@redhat•com>, Jean Delvare <khali@linux-fr•org>,
Greg KH <greg@kroah•com>,
"J. Bruce Fields" <bfields@fieldses•org>,
Trond Myklebust <trond.myklebust@fys•uio.no>,
Sage Weil <sage@newdream•net>,
Pekka Enberg <penberg@cs•helsinki.fi>,
Christoph Lameter <cl@linux-foundation•org>,
Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Al Viro <viro@ZenIV•linux.org.uk>,
"\"J??rn Engel\"" <joern@logfs•org>
Subject: Re: linux-next: current pending merge fix patches
Date: Mon, 1 Mar 2010 09:10:21 +0100 [thread overview]
Message-ID: <20100301081021.GB8049@elte.hu> (raw)
In-Reply-To: <20100301160445.5e281f11.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> This could also be taken as a reminder to the respective maintiners that
> they may want to do a merge of your tree before asking you to pull theirs.
I dont think that's generally correct for trivial conflicts: it's better if
Linus does the merge of a tree that is based in some stable tree.
It causes slightly messier criss-cross history: there will be the back-merge
commit plus the inevitable merge commit from Linus. It also makes bisection a
bit messier:
For example when bisecting i generally consider the 'boundary' of where Linus
pulls as a 'known point of stability': i.e. the 'subsystem side' is expected
to be well-tested and if there's a problem on that side, it's that subsystem's
domain.
"Linus's side", during the merge window, is a rolling tree of many freshly
merged trees, which inevitably piles up a few problems.
So it's IMO somewhat better to keep that boundary and not push out Linus's
side into subsystem trees: which then may merge a few new patches after having
merged Linus's tree, intermixing it all into a non-bisectable combination.
Plus there's also an indirect effect: it keeps people from merging back
Linus's tree all the time.
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.
Ingo
next prev parent reply other threads:[~2010-03-01 8:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 5:04 linux-next: current pending merge fix patches Stephen Rothwell
2010-03-01 8:10 ` Ingo Molnar [this message]
2010-03-01 8:55 ` Stephen Rothwell
2010-03-01 9:01 ` Ingo Molnar
2010-03-01 8:56 ` Ingo Molnar
2010-03-01 9:19 ` Ingo Molnar
2010-03-01 15:17 ` Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100301081021.GB8049@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=bfields@fieldses$(echo .)org \
--cc=cl@linux-foundation$(echo .)org \
--cc=davej@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=joern@logfs$(echo .)org \
--cc=khali@linux-fr$(echo .)org \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sage@newdream$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=trond.myklebust@fys$(echo .)uio.no \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox