blob: 387d8a44eda2933e8ed66090f779054559c2bf37 [file] [log] [blame]
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -03001Everything you ever wanted to know about Linux -stable releases
2===============================================================
Greg KHfc185d92005-07-29 12:14:34 -07003
Jesper Juhle48e9902006-01-09 20:53:59 -08004Rules on what kind of patches are accepted, and which ones are not, into the
5"-stable" tree:
Greg KHfc185d92005-07-29 12:14:34 -07006
7 - It must be obviously correct and tested.
Matt LaPlante84eb8d02006-10-03 22:53:09 +02008 - It cannot be bigger than 100 lines, with context.
Greg KHfc185d92005-07-29 12:14:34 -07009 - It must fix only one thing.
10 - It must fix a real bug that bothers people (not a, "This could be a
Jesper Juhle48e9902006-01-09 20:53:59 -080011 problem..." type thing).
Greg KHfc185d92005-07-29 12:14:34 -070012 - It must fix a problem that causes a build error (but not for things
13 marked CONFIG_BROKEN), an oops, a hang, data corruption, a real
Jesper Juhle48e9902006-01-09 20:53:59 -080014 security issue, or some "oh, that's not good" issue. In short, something
15 critical.
Mel Gorman8191e0d2012-06-21 11:36:50 +010016 - Serious issues as reported by a user of a distribution kernel may also
17 be considered if they fix a notable performance or interactivity issue.
18 As these fixes are not as obvious and have a higher risk of a subtle
19 regression they should only be submitted by a distribution kernel
20 maintainer and include an addendum linking to a bugzilla entry if it
21 exists and additional information on the user-visible impact.
Josh Boyer79cd80a2008-10-24 10:10:42 -040022 - New device IDs and quirks are also accepted.
Jesper Juhle48e9902006-01-09 20:53:59 -080023 - No "theoretical race condition" issues, unless an explanation of how the
24 race can be exploited is also provided.
Matt LaPlante84eb8d02006-10-03 22:53:09 +020025 - It cannot contain any "trivial" fixes in it (spelling changes,
Jesper Juhle48e9902006-01-09 20:53:59 -080026 whitespace cleanups, etc).
Jesper Juhle48e9902006-01-09 20:53:59 -080027 - It must follow the Documentation/SubmittingPatches rules.
Stefan Richter959fb1c2010-04-01 22:01:52 +020028 - It or an equivalent fix must already exist in Linus' tree (upstream).
Greg KHfc185d92005-07-29 12:14:34 -070029
30
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030031Procedure for submitting patches to the -stable tree
32----------------------------------------------------
Greg KHfc185d92005-07-29 12:14:34 -070033
Dave Chilukb76fc282014-06-24 10:11:26 -050034 - If the patch covers files in net/ or drivers/net please follow netdev stable
35 submission guidelines as described in
36 Documentation/networking/netdev-FAQ.txt
Brian Norris5de61e72014-12-18 14:55:53 -080037 - Security patches should not be handled (solely) by the -stable review
38 process but should follow the procedures in Documentation/SecurityBugs.
39
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030040For all other submissions, choose one of the following procedures
41-----------------------------------------------------------------
Brian Norris5de61e72014-12-18 14:55:53 -080042
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030043.. _option_1:
Brian Norris5de61e72014-12-18 14:55:53 -080044
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030045Option 1
46********
47
48To have the patch automatically included in the stable tree, add the tag
49
50.. code-block:: none
51
Josh Boyer5fa22422011-10-17 21:16:39 -040052 Cc: stable@vger.kernel.org
Brian Norris5de61e72014-12-18 14:55:53 -080053
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030054in the sign-off area. Once the patch is merged it will be applied to
55the stable tree without anything else needing to be done by the author
56or subsystem maintainer.
Brian Norris5de61e72014-12-18 14:55:53 -080057
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030058.. _option_2:
Brian Norris5de61e72014-12-18 14:55:53 -080059
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030060Option 2
61********
Brian Norris5de61e72014-12-18 14:55:53 -080062
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030063After the patch has been merged to Linus' tree, send an email to
64stable@vger.kernel.org containing the subject of the patch, the commit ID,
65why you think it should be applied, and what kernel version you wish it to
66be applied to.
Brian Norris5de61e72014-12-18 14:55:53 -080067
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030068.. _option_3:
Christoffer Dallbde1b292015-05-13 22:01:07 +020069
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030070Option 3
71********
72
73Send the patch, after verifying that it follows the above rules, to
74stable@vger.kernel.org. You must note the upstream commit ID in the
75changelog of your submission, as well as the kernel version you wish
76it to be applied to.
77
78:ref:`option_1` is **strongly** preferred, is the easiest and most common.
79:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed
80worthy at the time it is applied to a public git tree (for instance, because
81it deserves more regression testing first). :ref:`option_3` is especially
82useful if the patch needs some special handling to apply to an older kernel
83(e.g., if API's have changed in the meantime).
84
85Note that for :ref:`option_3`, if the patch deviates from the original
86upstream patch (for example because it had to be backported) this must be very
87clearly documented and justified in the patch description.
Christoffer Dallbde1b292015-05-13 22:01:07 +020088
89The upstream commit ID must be specified with a separate line above the commit
90text, like this:
91
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -030092.. code-block:: none
93
Christoffer Dallbde1b292015-05-13 22:01:07 +020094 commit <sha1> upstream.
Brian Norris5de61e72014-12-18 14:55:53 -080095
96Additionally, some patches submitted via Option 1 may have additional patch
97prerequisites which can be cherry-picked. This can be specified in the following
98format in the sign-off area:
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +010099
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300100.. code-block:: none
101
Paul Gortmaker2584f522012-06-05 11:15:50 -0400102 Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
103 Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
104 Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic
105 Cc: <stable@vger.kernel.org> # 3.3.x
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300106 Signed-off-by: Ingo Molnar <mingo@elte.hu>
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +0100107
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300108The tag sequence has the meaning of:
109
110.. code-block:: none
111
Sebastian Andrzej Siewior8e9b9362009-12-06 12:24:31 +0100112 git cherry-pick a1f84a3
113 git cherry-pick 1b9508f
114 git cherry-pick fd21073
115 git cherry-pick <this commit>
116
David Daneyfdc81b72015-03-26 10:09:08 -0700117Also, some patches may have kernel version prerequisites. This can be
118specified in the following format in the sign-off area:
119
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300120.. code-block:: none
121
Richard Weinbergerf9024932015-11-18 09:58:38 +0100122 Cc: <stable@vger.kernel.org> # 3.3.x-
David Daneyfdc81b72015-03-26 10:09:08 -0700123
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300124The tag has the meaning of:
125
126.. code-block:: none
127
David Daneyfdc81b72015-03-26 10:09:08 -0700128 git cherry-pick <this commit>
129
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300130For each "-stable" tree starting with the specified version.
David Daneyfdc81b72015-03-26 10:09:08 -0700131
Brian Norris5de61e72014-12-18 14:55:53 -0800132Following the submission:
133
Jesper Juhle48e9902006-01-09 20:53:59 -0800134 - The sender will receive an ACK when the patch has been accepted into the
135 queue, or a NAK if the patch is rejected. This response might take a few
136 days, according to the developer's schedules.
137 - If accepted, the patch will be added to the -stable queue, for review by
Stefan Richter46cdf8712008-02-08 23:26:02 +0100138 other developers and by the relevant subsystem maintainer.
Greg KHfc185d92005-07-29 12:14:34 -0700139
140
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300141Review cycle
142------------
Greg KHfc185d92005-07-29 12:14:34 -0700143
Jesper Juhle48e9902006-01-09 20:53:59 -0800144 - When the -stable maintainers decide for a review cycle, the patches will be
145 sent to the review committee, and the maintainer of the affected area of
146 the patch (unless the submitter is the maintainer of the area) and CC: to
147 the linux-kernel mailing list.
148 - The review committee has 48 hours in which to ACK or NAK the patch.
Greg KHfc185d92005-07-29 12:14:34 -0700149 - If the patch is rejected by a member of the committee, or linux-kernel
Jesper Juhle48e9902006-01-09 20:53:59 -0800150 members object to the patch, bringing up issues that the maintainers and
151 members did not realize, the patch will be dropped from the queue.
152 - At the end of the review cycle, the ACKed patches will be added to the
153 latest -stable release, and a new -stable release will happen.
154 - Security patches will be accepted into the -stable tree directly from the
155 security kernel team, and not go through the normal review cycle.
Greg KHfc185d92005-07-29 12:14:34 -0700156 Contact the kernel security team for more details on this procedure.
157
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300158Trees
159-----
Paul Gortmaker2584f522012-06-05 11:15:50 -0400160
161 - The queues of patches, for both completed versions and in progress
162 versions can be found at:
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300163
Paul Gortmaker2584f522012-06-05 11:15:50 -0400164 http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300165
Paul Gortmaker2584f522012-06-05 11:15:50 -0400166 - The finalized and tagged releases of all stable kernels can be found
167 in separate branches per version at:
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300168
Paul Gortmaker2584f522012-06-05 11:15:50 -0400169 http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git
170
Greg KHfc185d92005-07-29 12:14:34 -0700171
Mauro Carvalho Chehab5fe270a2016-09-19 08:07:51 -0300172Review committee
173----------------
Greg KHfc185d92005-07-29 12:14:34 -0700174
Jesper Juhle48e9902006-01-09 20:53:59 -0800175 - This is made up of a number of kernel developers who have volunteered for
176 this task, and a few that haven't.