]> bbs.cooldavid.org Git - net-next-2.6.git/blame - Documentation/stable_kernel_rules.txt
xps: Transmit Packet Steering
[net-next-2.6.git] / Documentation / stable_kernel_rules.txt
CommitLineData
fc185d95
GKH
1Everything you ever wanted to know about Linux 2.6 -stable releases.
2
e48e9909
JJ
3Rules on what kind of patches are accepted, and which ones are not, into the
4"-stable" tree:
fc185d95
GKH
5
6 - It must be obviously correct and tested.
84eb8d06 7 - It cannot be bigger than 100 lines, with context.
fc185d95
GKH
8 - It must fix only one thing.
9 - It must fix a real bug that bothers people (not a, "This could be a
e48e9909 10 problem..." type thing).
fc185d95
GKH
11 - 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
e48e9909
JJ
13 security issue, or some "oh, that's not good" issue. In short, something
14 critical.
79cd80a1 15 - New device IDs and quirks are also accepted.
e48e9909
JJ
16 - No "theoretical race condition" issues, unless an explanation of how the
17 race can be exploited is also provided.
84eb8d06 18 - It cannot contain any "trivial" fixes in it (spelling changes,
e48e9909 19 whitespace cleanups, etc).
e48e9909 20 - It must follow the Documentation/SubmittingPatches rules.
959fb1c5 21 - It or an equivalent fix must already exist in Linus' tree (upstream).
fc185d95
GKH
22
23
24Procedure for submitting patches to the -stable tree:
25
26 - Send the patch, after verifying that it follows the above rules, to
959fb1c5
SR
27 stable@kernel.org. You must note the upstream commit ID in the changelog
28 of your submission.
29 - To have the patch automatically included in the stable tree, add the tag
8e9b9362
SAS
30 Cc: stable@kernel.org
31 in the sign-off area. Once the patch is merged it will be applied to
32 the stable tree without anything else needing to be done by the author
33 or subsystem maintainer.
34 - If the patch requires other patches as prerequisites which can be
35 cherry-picked than this can be specified in the following format in
36 the sign-off area:
37
38 Cc: <stable@kernel.org> # .32.x: a1f84a3: sched: Check for idle
39 Cc: <stable@kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle
40 Cc: <stable@kernel.org> # .32.x: fd21073: sched: Fix affinity logic
41 Cc: <stable@kernel.org> # .32.x
42 Signed-off-by: Ingo Molnar <mingo@elte.hu>
43
44 The tag sequence has the meaning of:
45 git cherry-pick a1f84a3
46 git cherry-pick 1b9508f
47 git cherry-pick fd21073
48 git cherry-pick <this commit>
49
e48e9909
JJ
50 - The sender will receive an ACK when the patch has been accepted into the
51 queue, or a NAK if the patch is rejected. This response might take a few
52 days, according to the developer's schedules.
53 - If accepted, the patch will be added to the -stable queue, for review by
46cdf871 54 other developers and by the relevant subsystem maintainer.
fc185d95 55 - Security patches should not be sent to this alias, but instead to the
e48e9909 56 documented security@kernel.org address.
fc185d95
GKH
57
58
59Review cycle:
60
e48e9909
JJ
61 - When the -stable maintainers decide for a review cycle, the patches will be
62 sent to the review committee, and the maintainer of the affected area of
63 the patch (unless the submitter is the maintainer of the area) and CC: to
64 the linux-kernel mailing list.
65 - The review committee has 48 hours in which to ACK or NAK the patch.
fc185d95 66 - If the patch is rejected by a member of the committee, or linux-kernel
e48e9909
JJ
67 members object to the patch, bringing up issues that the maintainers and
68 members did not realize, the patch will be dropped from the queue.
69 - At the end of the review cycle, the ACKed patches will be added to the
70 latest -stable release, and a new -stable release will happen.
71 - Security patches will be accepted into the -stable tree directly from the
72 security kernel team, and not go through the normal review cycle.
fc185d95
GKH
73 Contact the kernel security team for more details on this procedure.
74
75
5d3f083d 76Review committee:
fc185d95 77
e48e9909
JJ
78 - This is made up of a number of kernel developers who have volunteered for
79 this task, and a few that haven't.