[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LNX.2.00.1204290119081.30870@swampdragon.chaosbits.net>
Date: Sun, 29 Apr 2012 01:22:06 +0200 (CEST)
From: Jesper Juhl <jj@...osbits.net>
To: Kees Cook <keescook@...omium.org>
cc: linux-kernel@...r.kernel.org,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Randy Dunlap <rdunlap@...otime.net>, linux-doc@...r.kernel.org
Subject: Re: [PATCH] docs: update HOWTO for 2.6.x -> 3.x versioning
On Wed, 18 Apr 2012, Kees Cook wrote:
> 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@...omium.org>
> ---
> Documentation/HOWTO | 32 ++++++++++++++++----------------
> 1 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/Documentation/HOWTO b/Documentation/HOWTO
> index f7ade3b..59c080f 100644
> --- a/Documentation/HOWTO
> +++ b/Documentation/HOWTO
> @@ -218,16 +218,16 @@ The development process
> 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 @@ mailing list about kernel releases:
> 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@...r.kernel.org>, and
> +3.x.y are maintained by the "stable" team <stable@...r.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 @@ The file Documentation/stable_kernel_rules.txt in the kernel tree
> 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 @@ revisions to it, and maintainers can mark patches as under review,
> 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
>
Looks good to me.
For what it's worth:
Acked-by: Jesper Juhl <jj@...osbits.net>
--
Jesper Juhl <jj@...osbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists