|
The goal is to capture the RT work as a linear series of merge-free
standalone commits. Changes made in merges don't lend themselves to
easy viewing or rebasing onto other versions. You typically end up
being forced to just generate a giant opaque diff if merges are in play.
In order to have the RT patchset as a linear merge-free set of
commits, we have to start somewhere. With the benefit of hindsight,
choosing 33-rt25 makes sense since we can immediately nullify the
VFS commits with their corresponding revert.
$ git rev-list v2.6.33.5-rt25 ^v2.6.33.5 |wc -l
699
$ git rev-list --no-merges v2.6.33.5-rt25 ^v2.6.33.5 |wc -l
618
Unfortunately you can see there are ~80 merge commits mixed in there.
Even if you assume the most trivial merge conflict, there are still
~100 instances where the 620 commits will fail to apply lurking.
Rewinding deeper into the 33 devel cycle doesn't help, since ~2/3
of them date from 31.
$ git rev-list --merges v2.6.33-rc8-rt1 ^v2.6.33-rc8|xargs git describe|grep v2
69
$ git rev-list --merges v2.6.33-rc8-rt1 ^v2.6.33-rc8|xargs git describe|grep v2
29
So, export the 618 raw commits (what you see here) and dive in.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
