From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linux-rt-users@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Subject: Linearized 2.6.33.7-rt30 patch set available (with free coffee!)
Date: Mon, 24 Jan 2011 12:00:21 -0500 [thread overview]
Message-ID: <4D3DB025.9090502@windriver.com> (raw)
Some of you may be asking just what that means.
The RT changes are like the milk added to a cup of coffee. You add a
small amount and it changes the flavour of the normal coffee (kernel.)
Now imagine the nice waitress keeps adding more coffee to your cup,
(merges) and you keep adding in a small splash of milk as well (new
RT commits). As time goes on, you kind of know what is in your coffee,
but you'd have a hard time recreating an identical one from scratch,
and you sure as heck can't take the milk *out* of your old coffee and
move it to a new fresh cup of coffee.
For most people, this is fine - they just want to drink the coffee,
(i.e. RT users) and have no interest in the finer details of exactly
how it was made. But there are some people who do care, and for us,
what this provides is the identical (line for line) v2.6.33.7.2-rt30
source code, but with a clearer recipe of how it was created.
Speaking more technically, the RT content in the tip git repo was
originally based on 2.6.31, and then the newer kernel.org content
was merged in. Merge commits are not easy to review/digest, and if
a functional change/addition was embedded in a merge commit, then
you'll have a hard time seeing it at all, unless you explicitly go
looking for it.
So the goal was to have a linear, merge-free set of commits that are
historically faithful to the original changes, but that stack on top
of the current 2.6.33.7 baseline to give you the *exact* same source.
Changes that were "hidden" in merge commits were either re-parented
to an existing changeset, or extracted to be visible stand alone
changesets in their own right -- depending on which made more sense.
The result will be familiar with long time RT users, in that you get
a series file, and a list of patches it applies, and you can use your
tool of choice to apply them (git-am, quilt, git-quiltimport, etc.)
Patches are in a git repo themselves, and you can find them here:
http://git.kernel.org/?p=linux/kernel/git/paulg/rt-patches.git
If you scan backwards in the repo, you can get a sense of scale of
what it took to (a) extract the original commits, then (b) make those
apply, and then (c) resolve all the deltas between the new tree and
the tip merge based tree. [I think (c) took more then (a)+(b) did!]
Paul.
next reply other threads:[~2011-01-24 17:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 17:00 Paul Gortmaker [this message]
2011-01-24 17:21 ` Linearized 2.6.33.7-rt30 patch set available (with free coffee!) Madovsky
-- strict thread matches above, loose matches on Subject: below --
2011-01-31 21:05 Frank Rowand
2011-01-31 21:12 ` Paul Gortmaker
2011-01-31 21:57 ` Frank Rowand
2011-01-31 23:35 ` Paul Gortmaker
2011-02-01 1:07 ` Frank Rowand
2011-02-01 2:15 ` Frank Rowand
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=4D3DB025.9090502@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).