summaryrefslogtreecommitdiff
path: root/Documentation/development-process
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-05-23 17:02:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 07:30:55 -0700
commite6a591e58e2c70912987f9f19d36ba967063b251 (patch)
tree2b49c1d8e401df32193709e9f8d3324e37d3359f /Documentation/development-process
parentef0eba477eeb424db97a162eb3a8c887b9c619df (diff)
Documentation/development-process: add staging & mmotm info
Update explanation of mmotm. Add explanation of drivers/staging/. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/development-process')
-rw-r--r--Documentation/development-process/2.Process14
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/development-process/2.Process b/Documentation/development-process/2.Process
index 11682b120e8d..97726eba6102 100644
--- a/Documentation/development-process/2.Process
+++ b/Documentation/development-process/2.Process
@@ -267,12 +267,8 @@ an appropriate subsystem tree or be sent directly to Linus. In a typical
development cycle, approximately 10% of the patches going into the mainline
get there via -mm.
-The current -mm patch can always be found from the front page of
-
- http://kernel.org/
-
-Those who want to see the current state of -mm can get the "-mm of the
-moment" tree, found at:
+The current -mm patch is available in the "mmotm" (-mm of the moment)
+directory at:
http://userweb.kernel.org/~akpm/mmotm/
@@ -307,6 +303,12 @@ volatility of linux-next tends to make it a difficult development target.
See http://lwn.net/Articles/289013/ for more information on this topic, and
stay tuned; much is still in flux where linux-next is involved.
+Besides the mmotm and linux-next trees, the kernel source tree now contains
+the drivers/staging/ directory and many sub-directories for drivers or
+filesystems that are on their way to being added to the kernel tree
+proper, but they remain in drivers/staging/ while they still need more
+work.
+
2.5: TOOLS