From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Cc: Jeremy Fitzhardinge <jeremy@goop•org>,
Xen Devel <Xen-devel@lists•xensource.com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
Linus <torvalds@linux-foundation•org>
Subject: Re: linux-next: manual merge of the xen tree with the swiotlb-xen tree
Date: Tue, 19 Oct 2010 01:49:41 +1100 [thread overview]
Message-ID: <20101019014941.adf9d20f.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20101018135512.GA19999@dumpdata.com>
[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]
Hi Konrad,
On Mon, 18 Oct 2010 09:55:12 -0400 Konrad Rzeszutek Wilk <konrad.wilk@oracle•com> wrote:
>
> Since I seem to have a knack for making mistakes, let me get some clarification
> so that I won't do it again.
>
> When is it Ok for me to put in the #linux-next, new stable features (so
> reviewed, acked, etc)? a) Is it post rc7? b) Or is it when Linus releases
> the kernel and Linus's merge window opens?
Stuff destined for 2.6.n should be enter linux-next (after being posted,
reviewed and tested) between 2.6.(n-1)-rc1 and about 2 weeks before 2.6.
(n-1) (usually -rc6 or 7). That way, hopefully we will have most
integration problems sorted out before Linus releases 2.6.(n-1) and the
code can go into Linus' tree during the merge window. We can then sort
out any bugs etc in Linus's tree during the -rc releases for 2.6.n (at
the same time putting features for 2.6.(n+1) into linux-next.
So the answer is c) pre -rc7 :-)
i.e. all the new features for 2.6.37 should have been in linux-next at
least a week ago ...
In an idea world, the week before the merge window should be spent
settling stuff down ready to go into Linus' tree. In the real world,
everyone seems to madly shove their new features into linux-next, rebase
their trees against some recent version of Linus' tree or do merges with
his tree (sometimes all three). A lot of this latter is completely
unnecessary and just means that all the previous testing is thrown away
with the introduction of more code from Linus' tree.
Have a look at the graphs at http://neuling.org/linux-next-size.html .
In the last week, we have had ~930 new commits enter linux-next (that is
over 12% of the total in linux-next). Since -rc7 came out, that number
is 1580 commits (over 20%). So instead of flattening off (and
stabilising) as we approach the merge window, the rate of change tends to
accelerate ...
/me gets off his soap box :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
prev parent reply other threads:[~2010-10-18 14:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-18 4:52 linux-next: manual merge of the xen tree with the swiotlb-xen tree Stephen Rothwell
2010-10-18 8:11 ` Jeremy Fitzhardinge
2010-10-18 13:55 ` Konrad Rzeszutek Wilk
2010-10-18 14:49 ` Stephen Rothwell [this message]
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=20101019014941.adf9d20f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jeremy@goop$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/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