Skip to content

Commit 591bfc6

Browse files
keesgregkh
authored andcommitted
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>
1 parent a15d49f commit 591bfc6

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Documentation/HOWTO

+16-16
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,16 @@ The development process
218218
Linux kernel development process currently consists of a few different
219219
main kernel "branches" and lots of different subsystem-specific kernel
220220
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
224224
- 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
226226

227-
2.6.x kernel tree
227+
3.x kernel tree
228228
-----------------
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
231231
process is as follows:
232232
- As soon as a new kernel is released a two weeks window is open,
233233
during this period of time maintainers can submit big diffs to
@@ -262,20 +262,20 @@ mailing list about kernel releases:
262262
released according to perceived bug status, not according to a
263263
preconceived timeline."
264264

265-
2.6.x.y -stable kernel tree
265+
3.x.y -stable kernel tree
266266
---------------------------
267-
Kernels with 4-part versions are -stable kernels. They contain
267+
Kernels with 3-part versions are -stable kernels. They contain
268268
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.
270270

271271
This is the recommended branch for users who want the most recent stable
272272
kernel and are not interested in helping test development/experimental
273273
versions.
274274

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
276276
kernel is the current stable kernel.
277277

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
279279
are released as needs dictate. The normal release period is approximately
280280
two weeks, but it can be longer if there are no pressing problems. A
281281
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
285285
documents what kinds of changes are acceptable for the -stable tree, and
286286
how the release process works.
287287

288-
2.6.x -git patches
288+
3.x -git patches
289289
------------------
290290
These are daily snapshots of Linus' kernel tree which are managed in a
291291
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,
317317
accepted, or rejected. Most of these patchwork sites are listed at
318318
http://patchwork.kernel.org/.
319319

320-
2.6.x -next kernel tree for integration tests
320+
3.x -next kernel tree for integration tests
321321
---------------------------------------------
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
323323
tree, they need to be integration-tested. For this purpose, a special
324324
testing repository exists into which virtually all subsystem trees are
325325
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
327327
http://linux.f-seidel.de/linux-next/pmwiki/
328328

329329
This way, the -next kernel gives a summary outlook onto what will be

0 commit comments

Comments
 (0)