]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/blame - Documentation/process/stable-kernel-rules.rst
KVM: arm64: vgic-v3: Log which GICv3 system registers are trapped
[mirror_ubuntu-zesty-kernel.git] / Documentation / process / stable-kernel-rules.rst
CommitLineData
609d99a3
MCC
1.. _stable_kernel_rules:
2
5fe270a4
MCC
3Everything you ever wanted to know about Linux -stable releases
4===============================================================
fc185d95 5
e48e9909
JJ
6Rules on what kind of patches are accepted, and which ones are not, into the
7"-stable" tree:
fc185d95
GKH
8
9 - It must be obviously correct and tested.
84eb8d06 10 - It cannot be bigger than 100 lines, with context.
fc185d95
GKH
11 - It must fix only one thing.
12 - It must fix a real bug that bothers people (not a, "This could be a
e48e9909 13 problem..." type thing).
fc185d95
GKH
14 - 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
e48e9909
JJ
16 security issue, or some "oh, that's not good" issue. In short, something
17 critical.
8191e0d9
MG
18 - 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.
79cd80a1 24 - New device IDs and quirks are also accepted.
e48e9909
JJ
25 - No "theoretical race condition" issues, unless an explanation of how the
26 race can be exploited is also provided.
84eb8d06 27 - It cannot contain any "trivial" fixes in it (spelling changes,
e48e9909 28 whitespace cleanups, etc).
dca22a63 29 - It must follow the
8c27ceff 30 :ref:`Documentation/process/submitting-patches.rst <submittingpatches>`
dca22a63 31 rules.
959fb1c5 32 - It or an equivalent fix must already exist in Linus' tree (upstream).
fc185d95
GKH
33
34
5fe270a4
MCC
35Procedure for submitting patches to the -stable tree
36----------------------------------------------------
fc185d95 37
b76fc285
DC
38 - If the patch covers files in net/ or drivers/net please follow netdev stable
39 submission guidelines as described in
40 Documentation/networking/netdev-FAQ.txt
5de61e7a 41 - Security patches should not be handled (solely) by the -stable review
dca22a63 42 process but should follow the procedures in
8c27ceff 43 :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.
5de61e7a 44
5fe270a4
MCC
45For all other submissions, choose one of the following procedures
46-----------------------------------------------------------------
5de61e7a 47
5fe270a4
MCC
48.. _option_1:
49
50Option 1
51********
52
53To have the patch automatically included in the stable tree, add the tag
54
55.. code-block:: none
5de61e7a 56
5fa22429 57 Cc: stable@vger.kernel.org
5de61e7a 58
5fe270a4
MCC
59in the sign-off area. Once the patch is merged it will be applied to
60the stable tree without anything else needing to be done by the author
61or subsystem maintainer.
62
63.. _option_2:
5de61e7a 64
5fe270a4
MCC
65Option 2
66********
5de61e7a 67
5fe270a4
MCC
68After the patch has been merged to Linus' tree, send an email to
69stable@vger.kernel.org containing the subject of the patch, the commit ID,
70why you think it should be applied, and what kernel version you wish it to
71be applied to.
5de61e7a 72
5fe270a4 73.. _option_3:
5de61e7a 74
5fe270a4
MCC
75Option 3
76********
bde1b294 77
5fe270a4
MCC
78Send the patch, after verifying that it follows the above rules, to
79stable@vger.kernel.org. You must note the upstream commit ID in the
80changelog of your submission, as well as the kernel version you wish
81it to be applied to.
82
83:ref:`option_1` is **strongly** preferred, is the easiest and most common.
84:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed
85worthy at the time it is applied to a public git tree (for instance, because
86it deserves more regression testing first). :ref:`option_3` is especially
87useful if the patch needs some special handling to apply to an older kernel
88(e.g., if API's have changed in the meantime).
89
90Note that for :ref:`option_3`, if the patch deviates from the original
91upstream patch (for example because it had to be backported) this must be very
92clearly documented and justified in the patch description.
bde1b294
CD
93
94The upstream commit ID must be specified with a separate line above the commit
95text, like this:
96
5fe270a4
MCC
97.. code-block:: none
98
bde1b294 99 commit <sha1> upstream.
5de61e7a
BN
100
101Additionally, some patches submitted via Option 1 may have additional patch
102prerequisites which can be cherry-picked. This can be specified in the following
103format in the sign-off area:
8e9b9362 104
5fe270a4
MCC
105.. code-block:: none
106
2584f521
PG
107 Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
108 Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
109 Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic
110 Cc: <stable@vger.kernel.org> # 3.3.x
5fe270a4
MCC
111 Signed-off-by: Ingo Molnar <mingo@elte.hu>
112
113The tag sequence has the meaning of:
114
115.. code-block:: none
8e9b9362 116
8e9b9362
SAS
117 git cherry-pick a1f84a3
118 git cherry-pick 1b9508f
119 git cherry-pick fd21073
120 git cherry-pick <this commit>
121
fdc81b79
DD
122Also, some patches may have kernel version prerequisites. This can be
123specified in the following format in the sign-off area:
124
5fe270a4
MCC
125.. code-block:: none
126
668863bd 127 Cc: <stable@vger.kernel.org> # 3.3.x
fdc81b79 128
5fe270a4
MCC
129The tag has the meaning of:
130
131.. code-block:: none
132
fdc81b79
DD
133 git cherry-pick <this commit>
134
5fe270a4 135For each "-stable" tree starting with the specified version.
fdc81b79 136
5de61e7a
BN
137Following the submission:
138
e48e9909
JJ
139 - The sender will receive an ACK when the patch has been accepted into the
140 queue, or a NAK if the patch is rejected. This response might take a few
141 days, according to the developer's schedules.
142 - If accepted, the patch will be added to the -stable queue, for review by
46cdf871 143 other developers and by the relevant subsystem maintainer.
fc185d95
GKH
144
145
5fe270a4
MCC
146Review cycle
147------------
fc185d95 148
e48e9909
JJ
149 - When the -stable maintainers decide for a review cycle, the patches will be
150 sent to the review committee, and the maintainer of the affected area of
151 the patch (unless the submitter is the maintainer of the area) and CC: to
152 the linux-kernel mailing list.
153 - The review committee has 48 hours in which to ACK or NAK the patch.
fc185d95 154 - If the patch is rejected by a member of the committee, or linux-kernel
e48e9909
JJ
155 members object to the patch, bringing up issues that the maintainers and
156 members did not realize, the patch will be dropped from the queue.
157 - At the end of the review cycle, the ACKed patches will be added to the
158 latest -stable release, and a new -stable release will happen.
159 - Security patches will be accepted into the -stable tree directly from the
160 security kernel team, and not go through the normal review cycle.
fc185d95
GKH
161 Contact the kernel security team for more details on this procedure.
162
5fe270a4
MCC
163Trees
164-----
2584f521
PG
165
166 - The queues of patches, for both completed versions and in progress
167 versions can be found at:
5fe270a4 168
2584f521 169 http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
5fe270a4 170
2584f521
PG
171 - The finalized and tagged releases of all stable kernels can be found
172 in separate branches per version at:
5fe270a4 173
2584f521
PG
174 http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git
175
fc185d95 176
5fe270a4
MCC
177Review committee
178----------------
fc185d95 179
e48e9909
JJ
180 - This is made up of a number of kernel developers who have volunteered for
181 this task, and a few that haven't.