blob: aee73e78c7d42a8aa7d9c1f630c705ddb6c3838c [file] [log] [blame]
Paul Gortmaker2584f522012-06-05 11:15:50 -04001Everything you ever wanted to know about Linux -stable releases.
Greg KHfc185d92005-07-29 12:14:34 -07002
Jesper Juhle48e9902006-01-09 20:53:59 -08003Rules on what kind of patches are accepted, and which ones are not, into the
4"-stable" tree:
Greg KHfc185d92005-07-29 12:14:34 -07005
6 - It must be obviously correct and tested.
Matt LaPlante84eb8d02006-10-03 22:53:09 +02007 - It cannot be bigger than 100 lines, with context.
Greg KHfc185d92005-07-29 12:14:34 -07008 - It must fix only one thing.
9 - It must fix a real bug that bothers people (not a, "This could be a
Jesper Juhle48e9902006-01-09 20:53:59 -080010 problem..." type thing).
Greg KHfc185d92005-07-29 12:14:34 -070011 - It must fix a problem that causes a build error (but not for things
12 marked CONFIG_BROKEN), an oops, a hang, data corruption, a real
Jesper Juhle48e9902006-01-09 20:53:59 -080013 security issue, or some "oh, that's not good" issue. In short, something
14 critical.
Mel Gorman8191e0d2012-06-21 11:36:50 +010015 - Serious issues as reported by a user of a distribution kernel may also
16 be considered if they fix a notable performance or interactivity issue.
17 As these fixes are not as obvious and have a higher risk of a subtle
18 regression they should only be submitted by a distribution kernel
19 maintainer and include an addendum linking to a bugzilla entry if it
20 exists and additional information on the user-visible impact.
Josh Boyer79cd80a2008-10-24 10:10:42 -040021 - New device IDs and quirks are also accepted.
Jesper Juhle48e9902006-01-09 20:53:59 -080022 - No "theoretical race condition" issues, unless an explanation of how the
23 race can be exploited is also provided.
Matt LaPlante84eb8d02006-10-03 22:53:09 +020024 - It cannot contain any "trivial" fixes in it (spelling changes,
Jesper Juhle48e9902006-01-09 20:53:59 -080025 whitespace cleanups, etc).
Jesper Juhle48e9902006-01-09 20:53:59 -080026 - It must follow the Documentation/SubmittingPatches rules.
Stefan Richter959fb1c2010-04-01 22:01:52 +020027 - It or an equivalent fix must already exist in Linus' tree (upstream).
Greg KHfc185d92005-07-29 12:14:34 -070028
29
30Procedure for submitting patches to the -stable tree:
31
Dave Chilukb76fc282014-06-24 10:11:26 -050032 - If the patch covers files in net/ or drivers/net please follow netdev stable
33 submission guidelines as described in
34 Documentation/networking/netdev-FAQ.txt
Greg KHfc185d92005-07-29 12:14:34 -070035 - Send the patch, after verifying that it follows the above rules, to
Josh Boyer5fa22422011-10-17 21:16:39 -040036 stable@vger.kernel.org. You must note the upstream commit ID in the
Greg Kroah-Hartman8381b5e2012-01-23 07:36:04 -080037 changelog of your submission, as well as the kernel version you wish
38 it to be applied to.
Stefan Richter959fb1c2010-04-01 22:01:52 +020039 - To have the patch automatically included in the stable tree, add the tag
Josh Boyer5fa22422011-10-17 21:16:39 -040040 Cc: stable@vger.kernel.org
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +010041 in the sign-off area. Once the patch is merged it will be applied to
42 the stable tree without anything else needing to be done by the author
43 or subsystem maintainer.
44 - If the patch requires other patches as prerequisites which can be
Brian Norris40806592014-04-02 09:37:08 -070045 cherry-picked, then this can be specified in the following format in
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +010046 the sign-off area:
47
Paul Gortmaker2584f522012-06-05 11:15:50 -040048 Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
49 Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
50 Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic
51 Cc: <stable@vger.kernel.org> # 3.3.x
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +010052 Signed-off-by: Ingo Molnar <mingo@elte.hu>
53
54 The tag sequence has the meaning of:
55 git cherry-pick a1f84a3
56 git cherry-pick 1b9508f
57 git cherry-pick fd21073
58 git cherry-pick <this commit>
59
Jesper Juhle48e9902006-01-09 20:53:59 -080060 - The sender will receive an ACK when the patch has been accepted into the
61 queue, or a NAK if the patch is rejected. This response might take a few
62 days, according to the developer's schedules.
63 - If accepted, the patch will be added to the -stable queue, for review by
Stefan Richter46cdf8712008-02-08 23:26:02 +010064 other developers and by the relevant subsystem maintainer.
Greg KHfc185d92005-07-29 12:14:34 -070065 - Security patches should not be sent to this alias, but instead to the
Jesper Juhle48e9902006-01-09 20:53:59 -080066 documented security@kernel.org address.
Greg KHfc185d92005-07-29 12:14:34 -070067
68
69Review cycle:
70
Jesper Juhle48e9902006-01-09 20:53:59 -080071 - When the -stable maintainers decide for a review cycle, the patches will be
72 sent to the review committee, and the maintainer of the affected area of
73 the patch (unless the submitter is the maintainer of the area) and CC: to
74 the linux-kernel mailing list.
75 - The review committee has 48 hours in which to ACK or NAK the patch.
Greg KHfc185d92005-07-29 12:14:34 -070076 - If the patch is rejected by a member of the committee, or linux-kernel
Jesper Juhle48e9902006-01-09 20:53:59 -080077 members object to the patch, bringing up issues that the maintainers and
78 members did not realize, the patch will be dropped from the queue.
79 - At the end of the review cycle, the ACKed patches will be added to the
80 latest -stable release, and a new -stable release will happen.
81 - Security patches will be accepted into the -stable tree directly from the
82 security kernel team, and not go through the normal review cycle.
Greg KHfc185d92005-07-29 12:14:34 -070083 Contact the kernel security team for more details on this procedure.
84
Paul Gortmaker2584f522012-06-05 11:15:50 -040085Trees:
86
87 - The queues of patches, for both completed versions and in progress
88 versions can be found at:
89 http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
90 - The finalized and tagged releases of all stable kernels can be found
91 in separate branches per version at:
92 http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git
93
Greg KHfc185d92005-07-29 12:14:34 -070094
Matt LaPlante5d3f0832006-11-30 05:21:10 +010095Review committee:
Greg KHfc185d92005-07-29 12:14:34 -070096
Jesper Juhle48e9902006-01-09 20:53:59 -080097 - This is made up of a number of kernel developers who have volunteered for
98 this task, and a few that haven't.