stable-kernel-rules.rst 7.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204
  1. .. _stable_kernel_rules:
  2. Everything you ever wanted to know about Linux -stable releases
  3. ===============================================================
  4. Rules on what kind of patches are accepted, and which ones are not, into the
  5. "-stable" tree:
  6. - It must be obviously correct and tested.
  7. - It cannot be bigger than 100 lines, with context.
  8. - It must fix only one thing.
  9. - It must fix a real bug that bothers people (not a, "This could be a
  10. problem..." type thing).
  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
  13. security issue, or some "oh, that's not good" issue. In short, something
  14. critical.
  15. - Serious issues as reported by a user of a distribution kernel may also
  16. be considered if they fix a notable performance or interactivity issue.
  17. As these fixes are not as obvious and have a higher risk of a subtle
  18. regression they should only be submitted by a distribution kernel
  19. maintainer and include an addendum linking to a bugzilla entry if it
  20. exists and additional information on the user-visible impact.
  21. - New device IDs and quirks are also accepted.
  22. - No "theoretical race condition" issues, unless an explanation of how the
  23. race can be exploited is also provided.
  24. - It cannot contain any "trivial" fixes in it (spelling changes,
  25. whitespace cleanups, etc).
  26. - It must follow the
  27. :ref:`Documentation/process/submitting-patches.rst <submittingpatches>`
  28. rules.
  29. - It or an equivalent fix must already exist in Linus' tree (upstream).
  30. Procedure for submitting patches to the -stable tree
  31. ----------------------------------------------------
  32. .. note::
  33. Security patches should not be handled (solely) by the -stable review
  34. process but should follow the procedures in
  35. :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.
  36. For all other submissions, choose one of the following procedures
  37. -----------------------------------------------------------------
  38. .. _option_1:
  39. Option 1
  40. ********
  41. To have the patch automatically included in the stable tree, add the tag
  42. .. code-block:: none
  43. Cc: [email protected]
  44. in the sign-off area. Once the patch is merged it will be applied to
  45. the stable tree without anything else needing to be done by the author
  46. or subsystem maintainer.
  47. .. _option_2:
  48. Option 2
  49. ********
  50. After the patch has been merged to Linus' tree, send an email to
  51. [email protected] containing the subject of the patch, the commit ID,
  52. why you think it should be applied, and what kernel version you wish it to
  53. be applied to.
  54. .. _option_3:
  55. Option 3
  56. ********
  57. Send the patch, after verifying that it follows the above rules, to
  58. [email protected]. You must note the upstream commit ID in the
  59. changelog of your submission, as well as the kernel version you wish
  60. it to be applied to.
  61. :ref:`option_1` is **strongly** preferred, is the easiest and most common.
  62. :ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed
  63. worthy at the time it is applied to a public git tree (for instance, because
  64. it deserves more regression testing first). :ref:`option_3` is especially
  65. useful if the original upstream patch needs to be backported (for example
  66. the backport needs some special handling due to e.g. API changes).
  67. Note that for :ref:`option_3`, if the patch deviates from the original
  68. upstream patch (for example because it had to be backported) this must be very
  69. clearly documented and justified in the patch description.
  70. The upstream commit ID must be specified with a separate line above the commit
  71. text, like this:
  72. .. code-block:: none
  73. commit <sha1> upstream.
  74. or alternatively:
  75. .. code-block:: none
  76. [ Upstream commit <sha1> ]
  77. Additionally, some patches submitted via :ref:`option_1` may have additional
  78. patch prerequisites which can be cherry-picked. This can be specified in the
  79. following format in the sign-off area:
  80. .. code-block:: none
  81. Cc: <[email protected]> # 3.3.x: a1f84a3: sched: Check for idle
  82. Cc: <[email protected]> # 3.3.x: 1b9508f: sched: Rate-limit newidle
  83. Cc: <[email protected]> # 3.3.x: fd21073: sched: Fix affinity logic
  84. Cc: <[email protected]> # 3.3.x
  85. Signed-off-by: Ingo Molnar <[email protected]>
  86. The tag sequence has the meaning of:
  87. .. code-block:: none
  88. git cherry-pick a1f84a3
  89. git cherry-pick 1b9508f
  90. git cherry-pick fd21073
  91. git cherry-pick <this commit>
  92. Also, some patches may have kernel version prerequisites. This can be
  93. specified in the following format in the sign-off area:
  94. .. code-block:: none
  95. Cc: <[email protected]> # 3.3.x
  96. The tag has the meaning of:
  97. .. code-block:: none
  98. git cherry-pick <this commit>
  99. For each "-stable" tree starting with the specified version.
  100. Following the submission:
  101. - The sender will receive an ACK when the patch has been accepted into the
  102. queue, or a NAK if the patch is rejected. This response might take a few
  103. days, according to the developer's schedules.
  104. - If accepted, the patch will be added to the -stable queue, for review by
  105. other developers and by the relevant subsystem maintainer.
  106. Review cycle
  107. ------------
  108. - When the -stable maintainers decide for a review cycle, the patches will be
  109. sent to the review committee, and the maintainer of the affected area of
  110. the patch (unless the submitter is the maintainer of the area) and CC: to
  111. the linux-kernel mailing list.
  112. - The review committee has 48 hours in which to ACK or NAK the patch.
  113. - If the patch is rejected by a member of the committee, or linux-kernel
  114. members object to the patch, bringing up issues that the maintainers and
  115. members did not realize, the patch will be dropped from the queue.
  116. - The ACKed patches will be posted again as part of release candidate (-rc)
  117. to be tested by developers and testers.
  118. - Usually only one -rc release is made, however if there are any outstanding
  119. issues, some patches may be modified or dropped or additional patches may
  120. be queued. Additional -rc releases are then released and tested until no
  121. issues are found.
  122. - Responding to the -rc releases can be done on the mailing list by sending
  123. a "Tested-by:" email with any testing information desired. The "Tested-by:"
  124. tags will be collected and added to the release commit.
  125. - At the end of the review cycle, the new -stable release will be released
  126. containing all the queued and tested patches.
  127. - Security patches will be accepted into the -stable tree directly from the
  128. security kernel team, and not go through the normal review cycle.
  129. Contact the kernel security team for more details on this procedure.
  130. Trees
  131. -----
  132. - The queues of patches, for both completed versions and in progress
  133. versions can be found at:
  134. https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git
  135. - The finalized and tagged releases of all stable kernels can be found
  136. in separate branches per version at:
  137. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
  138. - The release candidate of all stable kernel versions can be found at:
  139. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/
  140. .. warning::
  141. The -stable-rc tree is a snapshot in time of the stable-queue tree and
  142. will change frequently, hence will be rebased often. It should only be
  143. used for testing purposes (e.g. to be consumed by CI systems).
  144. Review committee
  145. ----------------
  146. - This is made up of a number of kernel developers who have volunteered for
  147. this task, and a few that haven't.