From: Paul M. <le...@li...> - 2003-05-04 19:54:24
|
Just to let everyone know (especially those not on linuxsh-cvs), I've merged the linux-2_5-restructure-saturn branch into HEAD. This includes pretty much the entire bulk of the 2.5 restructuring effort as well as lots of other new and fun things, and also brings us in sync with 2.5.68. The side effect of this is that a few ports will need some updating, and some processor specific stuff still needs to be cleaned up to work (sh2, sh3, and st40, as an example). The large chunks of the merge have been tagged accordingly in the same fashion the last restructure merge was done in. As such, the state of HEAD _prior_ to the merge is tagged as linux-2_5-restructure-saturn-premerge and after the merge (such as it is now), the tag is linux-2_5-restructure-saturn-postmerge Also, ChangeLogs have been keept relatively up-to-date with some of the events that transpired in the restructure branches, with quite a bit occuring in ChangeLog-2002. For history, there are a few branches that were started and are either being killed off or are already dead. linux-2_5-restructure (restructuring started here) linux-2_5-restructure-smp (SMP started (for SH7604)) linux-2_5-restructure-saturn (MMUless port started) The SMP and Saturn branches were forked off of the restructure branch (obviously). The SMP branch was short lived, and was integrated and consumed by the saturn branch once the basics were out of the way. The restructure branch also ceased to have much development done on it once things were more or less constantly being merged into the saturn branch. (I started to merge back into restructure, but grew tired of CVS's inability to even pretend to merge branches effeciently). I haven't been tagging independant 2.5.x merges into the saturn branch, so there's no immediate tag for 2.5.44 - 2.5.68, though if there's enough interest in this, I can go back and create tags by timestamp off of the AGAINST-2.5.xx files. At the moment there's not a whole lot of other documentation outlining changes, though the new-machine document will likely be updated in the near future to outline most of the backend changes. |