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>

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 · Greg Kroah-Hartman
1 parent a15d49fd30
Showing 1 changed file with 16 additions and 16 deletions Side-by-side Diff
Documentation/HOWTO
@@ -218,16 +218,16 @@
 Linux kernel development process currently consists of a few different
 main kernel "branches" and lots of different subsystem-specific kernel
 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
-  - 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:
   - 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
  
  
  
  
@@ -262,20 +262,20 @@
 	released according to perceived bug status, not according to a
 	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
-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
 kernel and are not interested in helping test development/experimental
 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.
  
-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
 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
@@ -285,7 +285,7 @@
 documents what kinds of changes are acceptable for the -stable tree, and
 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
 git repository (hence the name.) These patches are usually released
  
  
@@ -317,13 +317,13 @@
 accepted, or rejected.  Most of these patchwork sites are listed at
 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
 testing repository exists into which virtually all subsystem trees are
 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/
  
 This way, the -next kernel gives a summary outlook onto what will be
...	...	@@ -218,16 +218,16 @@
218	218	Linux kernel development process currently consists of a few different
219	219	main kernel "branches" and lots of different subsystem-specific kernel
220	220	branches. These different branches are:
221		- - main 2.6.x kernel tree
222		- - 2.6.x.y -stable kernel tree
223		- - 2.6.x -git kernel patches
	221	+ - main 3.x kernel tree
	222	+ - 3.x.y -stable kernel tree
	223	+ - 3.x -git kernel patches
224	224	- subsystem specific kernel trees and patches
225		- - the 2.6.x -next kernel tree for integration tests
	225	+ - the 3.x -next kernel tree for integration tests
226	226
227		-2.6.x kernel tree
	227	+3.x kernel tree
228	228	-----------------
229		-2.6.x kernels are maintained by Linus Torvalds, and can be found on
230		-kernel.org in the pub/linux/kernel/v2.6/ directory. Its development
	229	+3.x kernels are maintained by Linus Torvalds, and can be found on
	230	+kernel.org in the pub/linux/kernel/v3.x/ directory. Its development
231	231	process is as follows:
232	232	- As soon as a new kernel is released a two weeks window is open,
233	233	during this period of time maintainers can submit big diffs to
234	234
235	235
236	236
237	237
...	...	@@ -262,20 +262,20 @@
262	262	released according to perceived bug status, not according to a
263	263	preconceived timeline."
264	264
265		-2.6.x.y -stable kernel tree
	265	+3.x.y -stable kernel tree
266	266	---------------------------
267		-Kernels with 4-part versions are -stable kernels. They contain
	267	+Kernels with 3-part versions are -stable kernels. They contain
268	268	relatively small and critical fixes for security problems or significant
269		-regressions discovered in a given 2.6.x kernel.
	269	+regressions discovered in a given 3.x kernel.
270	270
271	271	This is the recommended branch for users who want the most recent stable
272	272	kernel and are not interested in helping test development/experimental
273	273	versions.
274	274
275		-If no 2.6.x.y kernel is available, then the highest numbered 2.6.x
	275	+If no 3.x.y kernel is available, then the highest numbered 3.x
276	276	kernel is the current stable kernel.
277	277
278		-2.6.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and
	278	+3.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and
279	279	are released as needs dictate. The normal release period is approximately
280	280	two weeks, but it can be longer if there are no pressing problems. A
281	281	security-related problem, instead, can cause a release to happen almost
...	...	@@ -285,7 +285,7 @@
285	285	documents what kinds of changes are acceptable for the -stable tree, and
286	286	how the release process works.
287	287
288		-2.6.x -git patches
	288	+3.x -git patches
289	289	------------------
290	290	These are daily snapshots of Linus' kernel tree which are managed in a
291	291	git repository (hence the name.) These patches are usually released
292	292
293	293
...	...	@@ -317,13 +317,13 @@
317	317	accepted, or rejected. Most of these patchwork sites are listed at
318	318	http://patchwork.kernel.org/.
319	319
320		-2.6.x -next kernel tree for integration tests
	320	+3.x -next kernel tree for integration tests
321	321	---------------------------------------------
322		-Before updates from subsystem trees are merged into the mainline 2.6.x
	322	+Before updates from subsystem trees are merged into the mainline 3.x
323	323	tree, they need to be integration-tested. For this purpose, a special
324	324	testing repository exists into which virtually all subsystem trees are
325	325	pulled on an almost daily basis:
326		- http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git
	326	+ http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git
327	327	http://linux.f-seidel.de/linux-next/pmwiki/
328	328
329	329	This way, the -next kernel gives a summary outlook onto what will be