blob: 1eba72708c7f8b17463722196a265b8e2bd99c6d [file] [log] [blame]
Mauro Carvalho Chehab609d99a2016-09-19 08:07:56 -03001.. _stable_kernel_rules:
2
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -03003Everything you ever wanted to know about Linux -stable releases
4===============================================================
Greg KHfc185d92005-07-29 12:14:34 -07005
Jesper Juhle48e9902006-01-09 20:53:59 -08006Rules on what kind of patches are accepted, and which ones are not, into the
7"-stable" tree:
Greg KHfc185d92005-07-29 12:14:34 -07008
9 - It must be obviously correct and tested.
Matt LaPlante84eb8d02006-10-03 22:53:09 +020010 - It cannot be bigger than 100 lines, with context.
Greg KHfc185d92005-07-29 12:14:34 -070011 - It must fix only one thing.
12 - It must fix a real bug that bothers people (not a, "This could be a
Jesper Juhle48e9902006-01-09 20:53:59 -080013 problem..." type thing).
Greg KHfc185d92005-07-29 12:14:34 -070014 - It must fix a problem that causes a build error (but not for things
15 marked CONFIG_BROKEN), an oops, a hang, data corruption, a real
Jesper Juhle48e9902006-01-09 20:53:59 -080016 security issue, or some "oh, that's not good" issue. In short, something
17 critical.
Mel Gorman8191e0d2012-06-21 11:36:50 +010018 - Serious issues as reported by a user of a distribution kernel may also
19 be considered if they fix a notable performance or interactivity issue.
20 As these fixes are not as obvious and have a higher risk of a subtle
21 regression they should only be submitted by a distribution kernel
22 maintainer and include an addendum linking to a bugzilla entry if it
23 exists and additional information on the user-visible impact.
Josh Boyer79cd80a2008-10-24 10:10:42 -040024 - New device IDs and quirks are also accepted.
Jesper Juhle48e9902006-01-09 20:53:59 -080025 - No "theoretical race condition" issues, unless an explanation of how the
26 race can be exploited is also provided.
Matt LaPlante84eb8d02006-10-03 22:53:09 +020027 - It cannot contain any "trivial" fixes in it (spelling changes,
Jesper Juhle48e9902006-01-09 20:53:59 -080028 whitespace cleanups, etc).
Jesper Juhle48e9902006-01-09 20:53:59 -080029 - It must follow the Documentation/SubmittingPatches rules.
Stefan Richter959fb1c2010-04-01 22:01:52 +020030 - It or an equivalent fix must already exist in Linus' tree (upstream).
Greg KHfc185d92005-07-29 12:14:34 -070031
32
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030033Procedure for submitting patches to the -stable tree
34----------------------------------------------------
Greg KHfc185d92005-07-29 12:14:34 -070035
Dave Chilukb76fc282014-06-24 10:11:26 -050036 - If the patch covers files in net/ or drivers/net please follow netdev stable
37 submission guidelines as described in
38 Documentation/networking/netdev-FAQ.txt
Brian Norris5de61e72014-12-18 14:55:53 -080039 - Security patches should not be handled (solely) by the -stable review
40 process but should follow the procedures in Documentation/SecurityBugs.
41
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030042For all other submissions, choose one of the following procedures
43-----------------------------------------------------------------
Brian Norris5de61e72014-12-18 14:55:53 -080044
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030045.. _option_1:
Brian Norris5de61e72014-12-18 14:55:53 -080046
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030047Option 1
48********
49
50To have the patch automatically included in the stable tree, add the tag
51
52.. code-block:: none
53
Josh Boyer5fa22422011-10-17 21:16:39 -040054 Cc: stable@vger.kernel.org
Brian Norris5de61e72014-12-18 14:55:53 -080055
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030056in the sign-off area. Once the patch is merged it will be applied to
57the stable tree without anything else needing to be done by the author
58or subsystem maintainer.
Brian Norris5de61e72014-12-18 14:55:53 -080059
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030060.. _option_2:
Brian Norris5de61e72014-12-18 14:55:53 -080061
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030062Option 2
63********
Brian Norris5de61e72014-12-18 14:55:53 -080064
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030065After the patch has been merged to Linus' tree, send an email to
66stable@vger.kernel.org containing the subject of the patch, the commit ID,
67why you think it should be applied, and what kernel version you wish it to
68be applied to.
Brian Norris5de61e72014-12-18 14:55:53 -080069
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030070.. _option_3:
Christoffer Dallbde1b292015-05-13 22:01:07 +020071
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030072Option 3
73********
74
75Send the patch, after verifying that it follows the above rules, to
76stable@vger.kernel.org. You must note the upstream commit ID in the
77changelog of your submission, as well as the kernel version you wish
78it to be applied to.
79
80:ref:`option_1` is **strongly** preferred, is the easiest and most common.
81:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed
82worthy at the time it is applied to a public git tree (for instance, because
83it deserves more regression testing first). :ref:`option_3` is especially
84useful if the patch needs some special handling to apply to an older kernel
85(e.g., if API's have changed in the meantime).
86
87Note that for :ref:`option_3`, if the patch deviates from the original
88upstream patch (for example because it had to be backported) this must be very
89clearly documented and justified in the patch description.
Christoffer Dallbde1b292015-05-13 22:01:07 +020090
91The upstream commit ID must be specified with a separate line above the commit
92text, like this:
93
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030094.. code-block:: none
95
Christoffer Dallbde1b292015-05-13 22:01:07 +020096 commit <sha1> upstream.
Brian Norris5de61e72014-12-18 14:55:53 -080097
98Additionally, some patches submitted via Option 1 may have additional patch
99prerequisites which can be cherry-picked. This can be specified in the following
100format in the sign-off area:
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +0100101
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300102.. code-block:: none
103
Paul Gortmaker2584f522012-06-05 11:15:50 -0400104 Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
105 Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
106 Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic
107 Cc: <stable@vger.kernel.org> # 3.3.x
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300108 Signed-off-by: Ingo Molnar <mingo@elte.hu>
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +0100109
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300110The tag sequence has the meaning of:
111
112.. code-block:: none
113
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +0100114 git cherry-pick a1f84a3
115 git cherry-pick 1b9508f
116 git cherry-pick fd21073
117 git cherry-pick <this commit>
118
David Daneyfdc81b72015-03-26 10:09:08 -0700119Also, some patches may have kernel version prerequisites. This can be
120specified in the following format in the sign-off area:
121
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300122.. code-block:: none
123
Richard Weinbergerf9024932015-11-18 09:58:38 +0100124 Cc: <stable@vger.kernel.org> # 3.3.x-
David Daneyfdc81b72015-03-26 10:09:08 -0700125
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300126The tag has the meaning of:
127
128.. code-block:: none
129
David Daneyfdc81b72015-03-26 10:09:08 -0700130 git cherry-pick <this commit>
131
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300132For each "-stable" tree starting with the specified version.
David Daneyfdc81b72015-03-26 10:09:08 -0700133
Brian Norris5de61e72014-12-18 14:55:53 -0800134Following the submission:
135
Jesper Juhle48e9902006-01-09 20:53:59 -0800136 - The sender will receive an ACK when the patch has been accepted into the
137 queue, or a NAK if the patch is rejected. This response might take a few
138 days, according to the developer's schedules.
139 - If accepted, the patch will be added to the -stable queue, for review by
Stefan Richter46cdf8712008-02-08 23:26:02 +0100140 other developers and by the relevant subsystem maintainer.
Greg KHfc185d92005-07-29 12:14:34 -0700141
142
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300143Review cycle
144------------
Greg KHfc185d92005-07-29 12:14:34 -0700145
Jesper Juhle48e9902006-01-09 20:53:59 -0800146 - When the -stable maintainers decide for a review cycle, the patches will be
147 sent to the review committee, and the maintainer of the affected area of
148 the patch (unless the submitter is the maintainer of the area) and CC: to
149 the linux-kernel mailing list.
150 - The review committee has 48 hours in which to ACK or NAK the patch.
Greg KHfc185d92005-07-29 12:14:34 -0700151 - If the patch is rejected by a member of the committee, or linux-kernel
Jesper Juhle48e9902006-01-09 20:53:59 -0800152 members object to the patch, bringing up issues that the maintainers and
153 members did not realize, the patch will be dropped from the queue.
154 - At the end of the review cycle, the ACKed patches will be added to the
155 latest -stable release, and a new -stable release will happen.
156 - Security patches will be accepted into the -stable tree directly from the
157 security kernel team, and not go through the normal review cycle.
Greg KHfc185d92005-07-29 12:14:34 -0700158 Contact the kernel security team for more details on this procedure.
159
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300160Trees
161-----
Paul Gortmaker2584f522012-06-05 11:15:50 -0400162
163 - The queues of patches, for both completed versions and in progress
164 versions can be found at:
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300165
Paul Gortmaker2584f522012-06-05 11:15:50 -0400166 http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300167
Paul Gortmaker2584f522012-06-05 11:15:50 -0400168 - The finalized and tagged releases of all stable kernels can be found
169 in separate branches per version at:
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300170
Paul Gortmaker2584f522012-06-05 11:15:50 -0400171 http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git
172
Greg KHfc185d92005-07-29 12:14:34 -0700173
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300174Review committee
175----------------
Greg KHfc185d92005-07-29 12:14:34 -0700176
Jesper Juhle48e9902006-01-09 20:53:59 -0800177 - This is made up of a number of kernel developers who have volunteered for
178 this task, and a few that haven't.