From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
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 19:55:32 +1100 [thread overview]
Message-ID: <20100301195532.d9e5ae64.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100301081021.GB8049@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
Hi Ingo,
On Mon, 1 Mar 2010 09:10:21 +0100 Ingo Molnar <mingo@elte•hu> 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.
In general I agree. I have singled out these conflict resolutions
because they involve either files not obvious from the conflicts (newly
introduced or chunks of code moved between files), or chunks of code that
are introduced in one tree but need to be modified after the otheris
merged. So in that sense they are a heads up to Linus because they are
only found after you do the merge and then get a build failure (if you do
the right builds).
So they can be resolved by Linus after he merges the second tree or by
the original maintainer of one of the trees merging/cherrypicking (part
of) the other tree or waiting for Linus to merge the other tree and then
do a merge with Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-03-01 8:55 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
2010-03-01 8:55 ` Stephen Rothwell [this message]
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=20100301195532.d9e5ae64.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sage@newdream$(echo .)net \
--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