diff options
| author | Mario Carrillo <mario.alfredo.c.arevalo@intel.com> | 2015-08-24 10:33:09 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2015-08-24 13:28:17 -0400 |
| commit | e4144fe5d47c91c92d36cdbd5f31ed8d6e3a57ab (patch) | |
| tree | 635fae9ae83aada3e8077f8299bf18e2fbe4b10a /Documentation/HOWTO | |
| parent | f007492964c125cb3e88a51ba2e50c3b44d33ae0 (diff) | |
docs: update HOWTO for 3.x -> 4.x versioning
The HOWTO document needed updating for the new kernel versioning.
Signed-off-by: Mario Carrillo <mario.alfredo.c.arevalo@intel.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/HOWTO')
| -rw-r--r-- | Documentation/HOWTO | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO index 93aa8604630e..21152d397b88 100644 --- a/Documentation/HOWTO +++ b/Documentation/HOWTO | |||
| @@ -218,16 +218,16 @@ The development process | |||
| 218 | Linux kernel development process currently consists of a few different | 218 | Linux kernel development process currently consists of a few different |
| 219 | main kernel "branches" and lots of different subsystem-specific kernel | 219 | main kernel "branches" and lots of different subsystem-specific kernel |
| 220 | branches. These different branches are: | 220 | branches. These different branches are: |
| 221 | - main 3.x kernel tree | 221 | - main 4.x kernel tree |
| 222 | - 3.x.y -stable kernel tree | 222 | - 4.x.y -stable kernel tree |
| 223 | - 3.x -git kernel patches | 223 | - 4.x -git kernel patches |
| 224 | - subsystem specific kernel trees and patches | 224 | - subsystem specific kernel trees and patches |
| 225 | - the 3.x -next kernel tree for integration tests | 225 | - the 4.x -next kernel tree for integration tests |
| 226 | 226 | ||
| 227 | 3.x kernel tree | 227 | 4.x kernel tree |
| 228 | ----------------- | 228 | ----------------- |
| 229 | 3.x kernels are maintained by Linus Torvalds, and can be found on | 229 | 4.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 | 230 | kernel.org in the pub/linux/kernel/v4.x/ directory. Its development |
| 231 | process is as follows: | 231 | process is as follows: |
| 232 | - As soon as a new kernel is released a two weeks window is open, | 232 | - As soon as a new kernel is released a two weeks window is open, |
| 233 | during this period of time maintainers can submit big diffs to | 233 | during this period of time maintainers can submit big diffs to |
| @@ -262,20 +262,20 @@ mailing list about kernel releases: | |||
| 262 | released according to perceived bug status, not according to a | 262 | released according to perceived bug status, not according to a |
| 263 | preconceived timeline." | 263 | preconceived timeline." |
| 264 | 264 | ||
| 265 | 3.x.y -stable kernel tree | 265 | 4.x.y -stable kernel tree |
| 266 | --------------------------- | 266 | --------------------------- |
| 267 | Kernels with 3-part versions are -stable kernels. They contain | 267 | Kernels with 3-part versions are -stable kernels. They contain |
| 268 | relatively small and critical fixes for security problems or significant | 268 | relatively small and critical fixes for security problems or significant |
| 269 | regressions discovered in a given 3.x kernel. | 269 | regressions discovered in a given 4.x kernel. |
| 270 | 270 | ||
| 271 | This is the recommended branch for users who want the most recent stable | 271 | This is the recommended branch for users who want the most recent stable |
| 272 | kernel and are not interested in helping test development/experimental | 272 | kernel and are not interested in helping test development/experimental |
| 273 | versions. | 273 | versions. |
| 274 | 274 | ||
| 275 | If no 3.x.y kernel is available, then the highest numbered 3.x | 275 | If no 4.x.y kernel is available, then the highest numbered 4.x |
| 276 | kernel is the current stable kernel. | 276 | kernel is the current stable kernel. |
| 277 | 277 | ||
| 278 | 3.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and | 278 | 4.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and |
| 279 | are released as needs dictate. The normal release period is approximately | 279 | are released as needs dictate. The normal release period is approximately |
| 280 | two weeks, but it can be longer if there are no pressing problems. A | 280 | two weeks, but it can be longer if there are no pressing problems. A |
| 281 | security-related problem, instead, can cause a release to happen almost | 281 | 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 | |||
| 285 | documents what kinds of changes are acceptable for the -stable tree, and | 285 | documents what kinds of changes are acceptable for the -stable tree, and |
| 286 | how the release process works. | 286 | how the release process works. |
| 287 | 287 | ||
| 288 | 3.x -git patches | 288 | 4.x -git patches |
| 289 | ------------------ | 289 | ------------------ |
| 290 | These are daily snapshots of Linus' kernel tree which are managed in a | 290 | These are daily snapshots of Linus' kernel tree which are managed in a |
| 291 | git repository (hence the name.) These patches are usually released | 291 | git repository (hence the name.) These patches are usually released |
| @@ -317,9 +317,9 @@ revisions to it, and maintainers can mark patches as under review, | |||
| 317 | accepted, or rejected. Most of these patchwork sites are listed at | 317 | accepted, or rejected. Most of these patchwork sites are listed at |
| 318 | http://patchwork.kernel.org/. | 318 | http://patchwork.kernel.org/. |
| 319 | 319 | ||
| 320 | 3.x -next kernel tree for integration tests | 320 | 4.x -next kernel tree for integration tests |
| 321 | --------------------------------------------- | 321 | --------------------------------------------- |
| 322 | Before updates from subsystem trees are merged into the mainline 3.x | 322 | Before updates from subsystem trees are merged into the mainline 4.x |
| 323 | tree, they need to be integration-tested. For this purpose, a special | 323 | tree, they need to be integration-tested. For this purpose, a special |
| 324 | testing repository exists into which virtually all subsystem trees are | 324 | testing repository exists into which virtually all subsystem trees are |
| 325 | pulled on an almost daily basis: | 325 | pulled on an almost daily basis: |
