Mauro Carvalho Chehab | 609d99a | 2016-09-19 08:07:56 -0300 | [diff] [blame] | 1 | .. _stable_kernel_rules: |
| 2 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 3 | Everything you ever wanted to know about Linux -stable releases |
| 4 | =============================================================== |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 5 | |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 6 | Rules on what kind of patches are accepted, and which ones are not, into the |
| 7 | "-stable" tree: |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 8 | |
| 9 | - It must be obviously correct and tested. |
Matt LaPlante | 84eb8d0 | 2006-10-03 22:53:09 +0200 | [diff] [blame] | 10 | - It cannot be bigger than 100 lines, with context. |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 11 | - It must fix only one thing. |
| 12 | - It must fix a real bug that bothers people (not a, "This could be a |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 13 | problem..." type thing). |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 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 |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 16 | security issue, or some "oh, that's not good" issue. In short, something |
| 17 | critical. |
Mel Gorman | 8191e0d | 2012-06-21 11:36:50 +0100 | [diff] [blame] | 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. |
Josh Boyer | 79cd80a | 2008-10-24 10:10:42 -0400 | [diff] [blame] | 24 | - New device IDs and quirks are also accepted. |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 25 | - No "theoretical race condition" issues, unless an explanation of how the |
| 26 | race can be exploited is also provided. |
Matt LaPlante | 84eb8d0 | 2006-10-03 22:53:09 +0200 | [diff] [blame] | 27 | - It cannot contain any "trivial" fixes in it (spelling changes, |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 28 | whitespace cleanups, etc). |
Mauro Carvalho Chehab | dca22a6 | 2016-09-21 08:51:05 -0300 | [diff] [blame] | 29 | - It must follow the |
Mauro Carvalho Chehab | 8c27ceff3 | 2016-10-18 10:12:27 -0200 | [diff] [blame] | 30 | :ref:`Documentation/process/submitting-patches.rst <submittingpatches>` |
Mauro Carvalho Chehab | dca22a6 | 2016-09-21 08:51:05 -0300 | [diff] [blame] | 31 | rules. |
Stefan Richter | 959fb1c | 2010-04-01 22:01:52 +0200 | [diff] [blame] | 32 | - It or an equivalent fix must already exist in Linus' tree (upstream). |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 33 | |
| 34 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 35 | Procedure for submitting patches to the -stable tree |
| 36 | ---------------------------------------------------- |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 37 | |
Dave Chiluk | b76fc28 | 2014-06-24 10:11:26 -0500 | [diff] [blame] | 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 |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 41 | - Security patches should not be handled (solely) by the -stable review |
Mauro Carvalho Chehab | dca22a6 | 2016-09-21 08:51:05 -0300 | [diff] [blame] | 42 | process but should follow the procedures in |
Mauro Carvalho Chehab | 8c27ceff3 | 2016-10-18 10:12:27 -0200 | [diff] [blame] | 43 | :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`. |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 44 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 45 | For all other submissions, choose one of the following procedures |
| 46 | ----------------------------------------------------------------- |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 47 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 48 | .. _option_1: |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 49 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 50 | Option 1 |
| 51 | ******** |
| 52 | |
| 53 | To have the patch automatically included in the stable tree, add the tag |
| 54 | |
| 55 | .. code-block:: none |
| 56 | |
Josh Boyer | 5fa2242 | 2011-10-17 21:16:39 -0400 | [diff] [blame] | 57 | Cc: stable@vger.kernel.org |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 58 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 59 | in the sign-off area. Once the patch is merged it will be applied to |
| 60 | the stable tree without anything else needing to be done by the author |
| 61 | or subsystem maintainer. |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 62 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 63 | .. _option_2: |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 64 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 65 | Option 2 |
| 66 | ******** |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 67 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 68 | After the patch has been merged to Linus' tree, send an email to |
| 69 | stable@vger.kernel.org containing the subject of the patch, the commit ID, |
| 70 | why you think it should be applied, and what kernel version you wish it to |
| 71 | be applied to. |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 72 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 73 | .. _option_3: |
Christoffer Dall | bde1b29 | 2015-05-13 22:01:07 +0200 | [diff] [blame] | 74 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 75 | Option 3 |
| 76 | ******** |
| 77 | |
| 78 | Send the patch, after verifying that it follows the above rules, to |
| 79 | stable@vger.kernel.org. You must note the upstream commit ID in the |
| 80 | changelog of your submission, as well as the kernel version you wish |
| 81 | it 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 |
| 85 | worthy at the time it is applied to a public git tree (for instance, because |
| 86 | it deserves more regression testing first). :ref:`option_3` is especially |
| 87 | useful 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 | |
| 90 | Note that for :ref:`option_3`, if the patch deviates from the original |
| 91 | upstream patch (for example because it had to be backported) this must be very |
| 92 | clearly documented and justified in the patch description. |
Christoffer Dall | bde1b29 | 2015-05-13 22:01:07 +0200 | [diff] [blame] | 93 | |
| 94 | The upstream commit ID must be specified with a separate line above the commit |
| 95 | text, like this: |
| 96 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 97 | .. code-block:: none |
| 98 | |
Christoffer Dall | bde1b29 | 2015-05-13 22:01:07 +0200 | [diff] [blame] | 99 | commit <sha1> upstream. |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 100 | |
| 101 | Additionally, some patches submitted via Option 1 may have additional patch |
| 102 | prerequisites which can be cherry-picked. This can be specified in the following |
| 103 | format in the sign-off area: |
Sebastian Andrzej Siewior | 8e9b936 | 2009-12-06 12:24:31 +0100 | [diff] [blame] | 104 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 105 | .. code-block:: none |
| 106 | |
Paul Gortmaker | 2584f52 | 2012-06-05 11:15:50 -0400 | [diff] [blame] | 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 |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 111 | Signed-off-by: Ingo Molnar <mingo@elte.hu> |
Sebastian Andrzej Siewior | 8e9b936 | 2009-12-06 12:24:31 +0100 | [diff] [blame] | 112 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 113 | The tag sequence has the meaning of: |
| 114 | |
| 115 | .. code-block:: none |
| 116 | |
Sebastian Andrzej Siewior | 8e9b936 | 2009-12-06 12:24:31 +0100 | [diff] [blame] | 117 | git cherry-pick a1f84a3 |
| 118 | git cherry-pick 1b9508f |
| 119 | git cherry-pick fd21073 |
| 120 | git cherry-pick <this commit> |
| 121 | |
David Daney | fdc81b7 | 2015-03-26 10:09:08 -0700 | [diff] [blame] | 122 | Also, some patches may have kernel version prerequisites. This can be |
| 123 | specified in the following format in the sign-off area: |
| 124 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 125 | .. code-block:: none |
| 126 | |
Johan Hovold | cf903e9 | 2017-04-03 15:53:34 +0200 | [diff] [blame] | 127 | Cc: <stable@vger.kernel.org> # 3.3.x |
David Daney | fdc81b7 | 2015-03-26 10:09:08 -0700 | [diff] [blame] | 128 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 129 | The tag has the meaning of: |
| 130 | |
| 131 | .. code-block:: none |
| 132 | |
David Daney | fdc81b7 | 2015-03-26 10:09:08 -0700 | [diff] [blame] | 133 | git cherry-pick <this commit> |
| 134 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 135 | For each "-stable" tree starting with the specified version. |
David Daney | fdc81b7 | 2015-03-26 10:09:08 -0700 | [diff] [blame] | 136 | |
Brian Norris | 5de61e7 | 2014-12-18 14:55:53 -0800 | [diff] [blame] | 137 | Following the submission: |
| 138 | |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 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 |
Stefan Richter | 46cdf871 | 2008-02-08 23:26:02 +0100 | [diff] [blame] | 143 | other developers and by the relevant subsystem maintainer. |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 144 | |
| 145 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 146 | Review cycle |
| 147 | ------------ |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 148 | |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 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. |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 154 | - If the patch is rejected by a member of the committee, or linux-kernel |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 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. |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 161 | Contact the kernel security team for more details on this procedure. |
| 162 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 163 | Trees |
| 164 | ----- |
Paul Gortmaker | 2584f52 | 2012-06-05 11:15:50 -0400 | [diff] [blame] | 165 | |
| 166 | - The queues of patches, for both completed versions and in progress |
| 167 | versions can be found at: |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 168 | |
Paul Gortmaker | 2584f52 | 2012-06-05 11:15:50 -0400 | [diff] [blame] | 169 | http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 170 | |
Paul Gortmaker | 2584f52 | 2012-06-05 11:15:50 -0400 | [diff] [blame] | 171 | - The finalized and tagged releases of all stable kernels can be found |
| 172 | in separate branches per version at: |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 173 | |
Paul Gortmaker | 2584f52 | 2012-06-05 11:15:50 -0400 | [diff] [blame] | 174 | http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git |
| 175 | |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 176 | |
Mauro Carvalho Chehab | 5fe270a | 2016-09-19 08:07:51 -0300 | [diff] [blame] | 177 | Review committee |
| 178 | ---------------- |
Greg KH | fc185d9 | 2005-07-29 12:14:34 -0700 | [diff] [blame] | 179 | |
Jesper Juhl | e48e990 | 2006-01-09 20:53:59 -0800 | [diff] [blame] | 180 | - This is made up of a number of kernel developers who have volunteered for |
| 181 | this task, and a few that haven't. |