Forráskód Böngészése

docs: update HOWTO for 2.6.x -> 3.x versioning

The HOWTO document needed updating for the new kernel versioning. The
git URI for -next was updated as well.

Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Kees Cook 13 éve
szülő
commit
591bfc6bf9
1 módosított fájl, 16 hozzáadás és 16 törlés
  1. 16 16
      Documentation/HOWTO

+ 16 - 16
Documentation/HOWTO

@@ -218,16 +218,16 @@ The development process
 Linux kernel development process currently consists of a few different
 Linux kernel development process currently consists of a few different
 main kernel "branches" and lots of different subsystem-specific kernel
 main kernel "branches" and lots of different subsystem-specific kernel
 branches.  These different branches are:
 branches.  These different branches are:
-  - main 2.6.x kernel tree
-  - 2.6.x.y -stable kernel tree
-  - 2.6.x -git kernel patches
+  - main 3.x kernel tree
+  - 3.x.y -stable kernel tree
+  - 3.x -git kernel patches
   - subsystem specific kernel trees and patches
   - subsystem specific kernel trees and patches
-  - the 2.6.x -next kernel tree for integration tests
+  - the 3.x -next kernel tree for integration tests
 
 
-2.6.x kernel tree
+3.x kernel tree
 -----------------
 -----------------
-2.6.x kernels are maintained by Linus Torvalds, and can be found on
-kernel.org in the pub/linux/kernel/v2.6/ directory.  Its development
+3.x kernels are maintained by Linus Torvalds, and can be found on
+kernel.org in the pub/linux/kernel/v3.x/ directory.  Its development
 process is as follows:
 process is as follows:
   - As soon as a new kernel is released a two weeks window is open,
   - As soon as a new kernel is released a two weeks window is open,
     during this period of time maintainers can submit big diffs to
     during this period of time maintainers can submit big diffs to
@@ -262,20 +262,20 @@ mailing list about kernel releases:
 	released according to perceived bug status, not according to a
 	released according to perceived bug status, not according to a
 	preconceived timeline."
 	preconceived timeline."
 
 
-2.6.x.y -stable kernel tree
+3.x.y -stable kernel tree
 ---------------------------
 ---------------------------
-Kernels with 4-part versions are -stable kernels. They contain
+Kernels with 3-part versions are -stable kernels. They contain
 relatively small and critical fixes for security problems or significant
 relatively small and critical fixes for security problems or significant
-regressions discovered in a given 2.6.x kernel.
+regressions discovered in a given 3.x kernel.
 
 
 This is the recommended branch for users who want the most recent stable
 This is the recommended branch for users who want the most recent stable
 kernel and are not interested in helping test development/experimental
 kernel and are not interested in helping test development/experimental
 versions.
 versions.
 
 
-If no 2.6.x.y kernel is available, then the highest numbered 2.6.x
+If no 3.x.y kernel is available, then the highest numbered 3.x
 kernel is the current stable kernel.
 kernel is the current stable kernel.
 
 
-2.6.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and
+3.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and
 are released as needs dictate.  The normal release period is approximately
 are released as needs dictate.  The normal release period is approximately
 two weeks, but it can be longer if there are no pressing problems.  A
 two weeks, but it can be longer if there are no pressing problems.  A
 security-related problem, instead, can cause a release to happen almost
 security-related problem, instead, can cause a release to happen almost
@@ -285,7 +285,7 @@ The file Documentation/stable_kernel_rules.txt in the kernel tree
 documents what kinds of changes are acceptable for the -stable tree, and
 documents what kinds of changes are acceptable for the -stable tree, and
 how the release process works.
 how the release process works.
 
 
-2.6.x -git patches
+3.x -git patches
 ------------------
 ------------------
 These are daily snapshots of Linus' kernel tree which are managed in a
 These are daily snapshots of Linus' kernel tree which are managed in a
 git repository (hence the name.) These patches are usually released
 git repository (hence the name.) These patches are usually released
@@ -317,13 +317,13 @@ revisions to it, and maintainers can mark patches as under review,
 accepted, or rejected.  Most of these patchwork sites are listed at
 accepted, or rejected.  Most of these patchwork sites are listed at
 http://patchwork.kernel.org/.
 http://patchwork.kernel.org/.
 
 
-2.6.x -next kernel tree for integration tests
+3.x -next kernel tree for integration tests
 ---------------------------------------------
 ---------------------------------------------
-Before updates from subsystem trees are merged into the mainline 2.6.x
+Before updates from subsystem trees are merged into the mainline 3.x
 tree, they need to be integration-tested.  For this purpose, a special
 tree, they need to be integration-tested.  For this purpose, a special
 testing repository exists into which virtually all subsystem trees are
 testing repository exists into which virtually all subsystem trees are
 pulled on an almost daily basis:
 pulled on an almost daily basis:
-	http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git
+	http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git
 	http://linux.f-seidel.de/linux-next/pmwiki/
 	http://linux.f-seidel.de/linux-next/pmwiki/
 
 
 This way, the -next kernel gives a summary outlook onto what will be
 This way, the -next kernel gives a summary outlook onto what will be