submitting-patches.rst 37 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838
  1. .. _submittingpatches:
  2. Submitting patches: the essential guide to getting your code into the kernel
  3. ============================================================================
  4. For a person or company who wishes to submit a change to the Linux
  5. kernel, the process can sometimes be daunting if you're not familiar
  6. with "the system." This text is a collection of suggestions which
  7. can greatly increase the chances of your change being accepted.
  8. This document contains a large number of suggestions in a relatively terse
  9. format. For detailed information on how the kernel development process
  10. works, see Documentation/process/development-process.rst. Also, read
  11. Documentation/process/submit-checklist.rst
  12. for a list of items to check before submitting code.
  13. For device tree binding patches, read
  14. Documentation/devicetree/bindings/submitting-patches.rst.
  15. This documentation assumes that you're using ``git`` to prepare your patches.
  16. If you're unfamiliar with ``git``, you would be well-advised to learn how to
  17. use it, it will make your life as a kernel developer and in general much
  18. easier.
  19. Some subsystems and maintainer trees have additional information about
  20. their workflow and expectations, see
  21. :ref:`Documentation/process/maintainer-handbooks.rst <maintainer_handbooks_main>`.
  22. Obtain a current source tree
  23. ----------------------------
  24. If you do not have a repository with the current kernel source handy, use
  25. ``git`` to obtain one. You'll want to start with the mainline repository,
  26. which can be grabbed with::
  27. git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  28. Note, however, that you may not want to develop against the mainline tree
  29. directly. Most subsystem maintainers run their own trees and want to see
  30. patches prepared against those trees. See the **T:** entry for the subsystem
  31. in the MAINTAINERS file to find that tree, or simply ask the maintainer if
  32. the tree is not listed there.
  33. .. _describe_changes:
  34. Describe your changes
  35. ---------------------
  36. Describe your problem. Whether your patch is a one-line bug fix or
  37. 5000 lines of a new feature, there must be an underlying problem that
  38. motivated you to do this work. Convince the reviewer that there is a
  39. problem worth fixing and that it makes sense for them to read past the
  40. first paragraph.
  41. Describe user-visible impact. Straight up crashes and lockups are
  42. pretty convincing, but not all bugs are that blatant. Even if the
  43. problem was spotted during code review, describe the impact you think
  44. it can have on users. Keep in mind that the majority of Linux
  45. installations run kernels from secondary stable trees or
  46. vendor/product-specific trees that cherry-pick only specific patches
  47. from upstream, so include anything that could help route your change
  48. downstream: provoking circumstances, excerpts from dmesg, crash
  49. descriptions, performance regressions, latency spikes, lockups, etc.
  50. Quantify optimizations and trade-offs. If you claim improvements in
  51. performance, memory consumption, stack footprint, or binary size,
  52. include numbers that back them up. But also describe non-obvious
  53. costs. Optimizations usually aren't free but trade-offs between CPU,
  54. memory, and readability; or, when it comes to heuristics, between
  55. different workloads. Describe the expected downsides of your
  56. optimization so that the reviewer can weigh costs against benefits.
  57. Once the problem is established, describe what you are actually doing
  58. about it in technical detail. It's important to describe the change
  59. in plain English for the reviewer to verify that the code is behaving
  60. as you intend it to.
  61. The maintainer will thank you if you write your patch description in a
  62. form which can be easily pulled into Linux's source code management
  63. system, ``git``, as a "commit log". See :ref:`the_canonical_patch_format`.
  64. Solve only one problem per patch. If your description starts to get
  65. long, that's a sign that you probably need to split up your patch.
  66. See :ref:`split_changes`.
  67. When you submit or resubmit a patch or patch series, include the
  68. complete patch description and justification for it. Don't just
  69. say that this is version N of the patch (series). Don't expect the
  70. subsystem maintainer to refer back to earlier patch versions or referenced
  71. URLs to find the patch description and put that into the patch.
  72. I.e., the patch (series) and its description should be self-contained.
  73. This benefits both the maintainers and reviewers. Some reviewers
  74. probably didn't even receive earlier versions of the patch.
  75. Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
  76. instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
  77. to do frotz", as if you are giving orders to the codebase to change
  78. its behaviour.
  79. If you want to refer to a specific commit, don't just refer to the
  80. SHA-1 ID of the commit. Please also include the oneline summary of
  81. the commit, to make it easier for reviewers to know what it is about.
  82. Example::
  83. Commit e21d2170f36602ae2708 ("video: remove unnecessary
  84. platform_set_drvdata()") removed the unnecessary
  85. platform_set_drvdata(), but left the variable "dev" unused,
  86. delete it.
  87. You should also be sure to use at least the first twelve characters of the
  88. SHA-1 ID. The kernel repository holds a *lot* of objects, making
  89. collisions with shorter IDs a real possibility. Bear in mind that, even if
  90. there is no collision with your six-character ID now, that condition may
  91. change five years from now.
  92. If related discussions or any other background information behind the change
  93. can be found on the web, add 'Link:' tags pointing to it. In case your patch
  94. fixes a bug, for example, add a tag with a URL referencing the report in the
  95. mailing list archives or a bug tracker; if the patch is a result of some
  96. earlier mailing list discussion or something documented on the web, point to
  97. it.
  98. When linking to mailing list archives, preferably use the lore.kernel.org
  99. message archiver service. To create the link URL, use the contents of the
  100. ``Message-Id`` header of the message without the surrounding angle brackets.
  101. For example::
  102. Link: https://lore.kernel.org/r/[email protected]/
  103. Please check the link to make sure that it is actually working and points
  104. to the relevant message.
  105. However, try to make your explanation understandable without external
  106. resources. In addition to giving a URL to a mailing list archive or bug,
  107. summarize the relevant points of the discussion that led to the
  108. patch as submitted.
  109. If your patch fixes a bug in a specific commit, e.g. you found an issue using
  110. ``git bisect``, please use the 'Fixes:' tag with the first 12 characters of
  111. the SHA-1 ID, and the one line summary. Do not split the tag across multiple
  112. lines, tags are exempt from the "wrap at 75 columns" rule in order to simplify
  113. parsing scripts. For example::
  114. Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")
  115. The following ``git config`` settings can be used to add a pretty format for
  116. outputting the above style in the ``git log`` or ``git show`` commands::
  117. [core]
  118. abbrev = 12
  119. [pretty]
  120. fixes = Fixes: %h (\"%s\")
  121. An example call::
  122. $ git log -1 --pretty=fixes 54a4f0239f2e
  123. Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")
  124. .. _split_changes:
  125. Separate your changes
  126. ---------------------
  127. Separate each **logical change** into a separate patch.
  128. For example, if your changes include both bug fixes and performance
  129. enhancements for a single driver, separate those changes into two
  130. or more patches. If your changes include an API update, and a new
  131. driver which uses that new API, separate those into two patches.
  132. On the other hand, if you make a single change to numerous files,
  133. group those changes into a single patch. Thus a single logical change
  134. is contained within a single patch.
  135. The point to remember is that each patch should make an easily understood
  136. change that can be verified by reviewers. Each patch should be justifiable
  137. on its own merits.
  138. If one patch depends on another patch in order for a change to be
  139. complete, that is OK. Simply note **"this patch depends on patch X"**
  140. in your patch description.
  141. When dividing your change into a series of patches, take special care to
  142. ensure that the kernel builds and runs properly after each patch in the
  143. series. Developers using ``git bisect`` to track down a problem can end up
  144. splitting your patch series at any point; they will not thank you if you
  145. introduce bugs in the middle.
  146. If you cannot condense your patch set into a smaller set of patches,
  147. then only post say 15 or so at a time and wait for review and integration.
  148. Style-check your changes
  149. ------------------------
  150. Check your patch for basic style violations, details of which can be
  151. found in Documentation/process/coding-style.rst.
  152. Failure to do so simply wastes
  153. the reviewers time and will get your patch rejected, probably
  154. without even being read.
  155. One significant exception is when moving code from one file to
  156. another -- in this case you should not modify the moved code at all in
  157. the same patch which moves it. This clearly delineates the act of
  158. moving the code and your changes. This greatly aids review of the
  159. actual differences and allows tools to better track the history of
  160. the code itself.
  161. Check your patches with the patch style checker prior to submission
  162. (scripts/checkpatch.pl). Note, though, that the style checker should be
  163. viewed as a guide, not as a replacement for human judgment. If your code
  164. looks better with a violation then its probably best left alone.
  165. The checker reports at three levels:
  166. - ERROR: things that are very likely to be wrong
  167. - WARNING: things requiring careful review
  168. - CHECK: things requiring thought
  169. You should be able to justify all violations that remain in your
  170. patch.
  171. Select the recipients for your patch
  172. ------------------------------------
  173. You should always copy the appropriate subsystem maintainer(s) on any patch
  174. to code that they maintain; look through the MAINTAINERS file and the
  175. source code revision history to see who those maintainers are. The
  176. script scripts/get_maintainer.pl can be very useful at this step (pass paths to
  177. your patches as arguments to scripts/get_maintainer.pl). If you cannot find a
  178. maintainer for the subsystem you are working on, Andrew Morton
  179. ([email protected]) serves as a maintainer of last resort.
  180. You should also normally choose at least one mailing list to receive a copy
  181. of your patch set. [email protected] should be used by default
  182. for all patches, but the volume on that list has caused a number of
  183. developers to tune it out. Look in the MAINTAINERS file for a
  184. subsystem-specific list; your patch will probably get more attention there.
  185. Please do not spam unrelated lists, though.
  186. Many kernel-related lists are hosted on vger.kernel.org; you can find a
  187. list of them at http://vger.kernel.org/vger-lists.html. There are
  188. kernel-related lists hosted elsewhere as well, though.
  189. Do not send more than 15 patches at once to the vger mailing lists!!!
  190. Linus Torvalds is the final arbiter of all changes accepted into the
  191. Linux kernel. His e-mail address is <[email protected]>.
  192. He gets a lot of e-mail, and, at this point, very few patches go through
  193. Linus directly, so typically you should do your best to -avoid-
  194. sending him e-mail.
  195. If you have a patch that fixes an exploitable security bug, send that patch
  196. to [email protected]. For severe bugs, a short embargo may be considered
  197. to allow distributors to get the patch out to users; in such cases,
  198. obviously, the patch should not be sent to any public lists. See also
  199. Documentation/admin-guide/security-bugs.rst.
  200. Patches that fix a severe bug in a released kernel should be directed
  201. toward the stable maintainers by putting a line like this::
  202. Cc: [email protected]
  203. into the sign-off area of your patch (note, NOT an email recipient). You
  204. should also read Documentation/process/stable-kernel-rules.rst
  205. in addition to this document.
  206. If changes affect userland-kernel interfaces, please send the MAN-PAGES
  207. maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
  208. least a notification of the change, so that some information makes its way
  209. into the manual pages. User-space API changes should also be copied to
  210. [email protected].
  211. No MIME, no links, no compression, no attachments. Just plain text
  212. -------------------------------------------------------------------
  213. Linus and other kernel developers need to be able to read and comment
  214. on the changes you are submitting. It is important for a kernel
  215. developer to be able to "quote" your changes, using standard e-mail
  216. tools, so that they may comment on specific portions of your code.
  217. For this reason, all patches should be submitted by e-mail "inline". The
  218. easiest way to do this is with ``git send-email``, which is strongly
  219. recommended. An interactive tutorial for ``git send-email`` is available at
  220. https://git-send-email.io.
  221. If you choose not to use ``git send-email``:
  222. .. warning::
  223. Be wary of your editor's word-wrap corrupting your patch,
  224. if you choose to cut-n-paste your patch.
  225. Do not attach the patch as a MIME attachment, compressed or not.
  226. Many popular e-mail applications will not always transmit a MIME
  227. attachment as plain text, making it impossible to comment on your
  228. code. A MIME attachment also takes Linus a bit more time to process,
  229. decreasing the likelihood of your MIME-attached change being accepted.
  230. Exception: If your mailer is mangling patches then someone may ask
  231. you to re-send them using MIME.
  232. See Documentation/process/email-clients.rst for hints about configuring
  233. your e-mail client so that it sends your patches untouched.
  234. Respond to review comments
  235. --------------------------
  236. Your patch will almost certainly get comments from reviewers on ways in
  237. which the patch can be improved, in the form of a reply to your email. You must
  238. respond to those comments; ignoring reviewers is a good way to get ignored in
  239. return. You can simply reply to their emails to answer their comments. Review
  240. comments or questions that do not lead to a code change should almost certainly
  241. bring about a comment or changelog entry so that the next reviewer better
  242. understands what is going on.
  243. Be sure to tell the reviewers what changes you are making and to thank them
  244. for their time. Code review is a tiring and time-consuming process, and
  245. reviewers sometimes get grumpy. Even in that case, though, respond
  246. politely and address the problems they have pointed out. When sending a next
  247. version, add a ``patch changelog`` to the cover letter or to individual patches
  248. explaining difference aganst previous submission (see
  249. :ref:`the_canonical_patch_format`).
  250. See Documentation/process/email-clients.rst for recommendations on email
  251. clients and mailing list etiquette.
  252. .. _resend_reminders:
  253. Don't get discouraged - or impatient
  254. ------------------------------------
  255. After you have submitted your change, be patient and wait. Reviewers are
  256. busy people and may not get to your patch right away.
  257. Once upon a time, patches used to disappear into the void without comment,
  258. but the development process works more smoothly than that now. You should
  259. receive comments within a week or so; if that does not happen, make sure
  260. that you have sent your patches to the right place. Wait for a minimum of
  261. one week before resubmitting or pinging reviewers - possibly longer during
  262. busy times like merge windows.
  263. It's also ok to resend the patch or the patch series after a couple of
  264. weeks with the word "RESEND" added to the subject line::
  265. [PATCH Vx RESEND] sub/sys: Condensed patch summary
  266. Don't add "RESEND" when you are submitting a modified version of your
  267. patch or patch series - "RESEND" only applies to resubmission of a
  268. patch or patch series which have not been modified in any way from the
  269. previous submission.
  270. Include PATCH in the subject
  271. -----------------------------
  272. Due to high e-mail traffic to Linus, and to linux-kernel, it is common
  273. convention to prefix your subject line with [PATCH]. This lets Linus
  274. and other kernel developers more easily distinguish patches from other
  275. e-mail discussions.
  276. ``git send-email`` will do this for you automatically.
  277. Sign your work - the Developer's Certificate of Origin
  278. ------------------------------------------------------
  279. To improve tracking of who did what, especially with patches that can
  280. percolate to their final resting place in the kernel through several
  281. layers of maintainers, we've introduced a "sign-off" procedure on
  282. patches that are being emailed around.
  283. The sign-off is a simple line at the end of the explanation for the
  284. patch, which certifies that you wrote it or otherwise have the right to
  285. pass it on as an open-source patch. The rules are pretty simple: if you
  286. can certify the below:
  287. Developer's Certificate of Origin 1.1
  288. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  289. By making a contribution to this project, I certify that:
  290. (a) The contribution was created in whole or in part by me and I
  291. have the right to submit it under the open source license
  292. indicated in the file; or
  293. (b) The contribution is based upon previous work that, to the best
  294. of my knowledge, is covered under an appropriate open source
  295. license and I have the right under that license to submit that
  296. work with modifications, whether created in whole or in part
  297. by me, under the same open source license (unless I am
  298. permitted to submit under a different license), as indicated
  299. in the file; or
  300. (c) The contribution was provided directly to me by some other
  301. person who certified (a), (b) or (c) and I have not modified
  302. it.
  303. (d) I understand and agree that this project and the contribution
  304. are public and that a record of the contribution (including all
  305. personal information I submit with it, including my sign-off) is
  306. maintained indefinitely and may be redistributed consistent with
  307. this project or the open source license(s) involved.
  308. then you just add a line saying::
  309. Signed-off-by: Random J Developer <[email protected]>
  310. using your real name (sorry, no pseudonyms or anonymous contributions.)
  311. This will be done for you automatically if you use ``git commit -s``.
  312. Reverts should also include "Signed-off-by". ``git revert -s`` does that
  313. for you.
  314. Some people also put extra tags at the end. They'll just be ignored for
  315. now, but you can do this to mark internal company procedures or just
  316. point out some special detail about the sign-off.
  317. Any further SoBs (Signed-off-by:'s) following the author's SoB are from
  318. people handling and transporting the patch, but were not involved in its
  319. development. SoB chains should reflect the **real** route a patch took
  320. as it was propagated to the maintainers and ultimately to Linus, with
  321. the first SoB entry signalling primary authorship of a single author.
  322. When to use Acked-by:, Cc:, and Co-developed-by:
  323. ------------------------------------------------
  324. The Signed-off-by: tag indicates that the signer was involved in the
  325. development of the patch, or that he/she was in the patch's delivery path.
  326. If a person was not directly involved in the preparation or handling of a
  327. patch but wishes to signify and record their approval of it then they can
  328. ask to have an Acked-by: line added to the patch's changelog.
  329. Acked-by: is often used by the maintainer of the affected code when that
  330. maintainer neither contributed to nor forwarded the patch.
  331. Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
  332. has at least reviewed the patch and has indicated acceptance. Hence patch
  333. mergers will sometimes manually convert an acker's "yep, looks good to me"
  334. into an Acked-by: (but note that it is usually better to ask for an
  335. explicit ack).
  336. Acked-by: does not necessarily indicate acknowledgement of the entire patch.
  337. For example, if a patch affects multiple subsystems and has an Acked-by: from
  338. one subsystem maintainer then this usually indicates acknowledgement of just
  339. the part which affects that maintainer's code. Judgement should be used here.
  340. When in doubt people should refer to the original discussion in the mailing
  341. list archives.
  342. If a person has had the opportunity to comment on a patch, but has not
  343. provided such comments, you may optionally add a ``Cc:`` tag to the patch.
  344. This is the only tag which might be added without an explicit action by the
  345. person it names - but it should indicate that this person was copied on the
  346. patch. This tag documents that potentially interested parties
  347. have been included in the discussion.
  348. Co-developed-by: states that the patch was co-created by multiple developers;
  349. it is used to give attribution to co-authors (in addition to the author
  350. attributed by the From: tag) when several people work on a single patch. Since
  351. Co-developed-by: denotes authorship, every Co-developed-by: must be immediately
  352. followed by a Signed-off-by: of the associated co-author. Standard sign-off
  353. procedure applies, i.e. the ordering of Signed-off-by: tags should reflect the
  354. chronological history of the patch insofar as possible, regardless of whether
  355. the author is attributed via From: or Co-developed-by:. Notably, the last
  356. Signed-off-by: must always be that of the developer submitting the patch.
  357. Note, the From: tag is optional when the From: author is also the person (and
  358. email) listed in the From: line of the email header.
  359. Example of a patch submitted by the From: author::
  360. <changelog>
  361. Co-developed-by: First Co-Author <[email protected]>
  362. Signed-off-by: First Co-Author <[email protected]>
  363. Co-developed-by: Second Co-Author <[email protected]>
  364. Signed-off-by: Second Co-Author <[email protected]>
  365. Signed-off-by: From Author <[email protected]>
  366. Example of a patch submitted by a Co-developed-by: author::
  367. From: From Author <[email protected]>
  368. <changelog>
  369. Co-developed-by: Random Co-Author <[email protected]>
  370. Signed-off-by: Random Co-Author <[email protected]>
  371. Signed-off-by: From Author <[email protected]>
  372. Co-developed-by: Submitting Co-Author <[email protected]>
  373. Signed-off-by: Submitting Co-Author <[email protected]>
  374. Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
  375. ----------------------------------------------------------------------
  376. The Reported-by tag gives credit to people who find bugs and report them and it
  377. hopefully inspires them to help us again in the future. Please note that if
  378. the bug was reported in private, then ask for permission first before using the
  379. Reported-by tag. The tag is intended for bugs; please do not use it to credit
  380. feature requests.
  381. A Tested-by: tag indicates that the patch has been successfully tested (in
  382. some environment) by the person named. This tag informs maintainers that
  383. some testing has been performed, provides a means to locate testers for
  384. future patches, and ensures credit for the testers.
  385. Reviewed-by:, instead, indicates that the patch has been reviewed and found
  386. acceptable according to the Reviewer's Statement:
  387. Reviewer's statement of oversight
  388. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  389. By offering my Reviewed-by: tag, I state that:
  390. (a) I have carried out a technical review of this patch to
  391. evaluate its appropriateness and readiness for inclusion into
  392. the mainline kernel.
  393. (b) Any problems, concerns, or questions relating to the patch
  394. have been communicated back to the submitter. I am satisfied
  395. with the submitter's response to my comments.
  396. (c) While there may be things that could be improved with this
  397. submission, I believe that it is, at this time, (1) a
  398. worthwhile modification to the kernel, and (2) free of known
  399. issues which would argue against its inclusion.
  400. (d) While I have reviewed the patch and believe it to be sound, I
  401. do not (unless explicitly stated elsewhere) make any
  402. warranties or guarantees that it will achieve its stated
  403. purpose or function properly in any given situation.
  404. A Reviewed-by tag is a statement of opinion that the patch is an
  405. appropriate modification of the kernel without any remaining serious
  406. technical issues. Any interested reviewer (who has done the work) can
  407. offer a Reviewed-by tag for a patch. This tag serves to give credit to
  408. reviewers and to inform maintainers of the degree of review which has been
  409. done on the patch. Reviewed-by: tags, when supplied by reviewers known to
  410. understand the subject area and to perform thorough reviews, will normally
  411. increase the likelihood of your patch getting into the kernel.
  412. Both Tested-by and Reviewed-by tags, once received on mailing list from tester
  413. or reviewer, should be added by author to the applicable patches when sending
  414. next versions. However if the patch has changed substantially in following
  415. version, these tags might not be applicable anymore and thus should be removed.
  416. Usually removal of someone's Tested-by or Reviewed-by tags should be mentioned
  417. in the patch changelog (after the '---' separator).
  418. A Suggested-by: tag indicates that the patch idea is suggested by the person
  419. named and ensures credit to the person for the idea. Please note that this
  420. tag should not be added without the reporter's permission, especially if the
  421. idea was not posted in a public forum. That said, if we diligently credit our
  422. idea reporters, they will, hopefully, be inspired to help us again in the
  423. future.
  424. A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
  425. is used to make it easy to determine where a bug originated, which can help
  426. review a bug fix. This tag also assists the stable kernel team in determining
  427. which stable kernel versions should receive your fix. This is the preferred
  428. method for indicating a bug fixed by the patch. See :ref:`describe_changes`
  429. for more details.
  430. Note: Attaching a Fixes: tag does not subvert the stable kernel rules
  431. process nor the requirement to Cc: [email protected] on all stable
  432. patch candidates. For more information, please read
  433. Documentation/process/stable-kernel-rules.rst.
  434. .. _the_canonical_patch_format:
  435. The canonical patch format
  436. --------------------------
  437. This section describes how the patch itself should be formatted. Note
  438. that, if you have your patches stored in a ``git`` repository, proper patch
  439. formatting can be had with ``git format-patch``. The tools cannot create
  440. the necessary text, though, so read the instructions below anyway.
  441. The canonical patch subject line is::
  442. Subject: [PATCH 001/123] subsystem: summary phrase
  443. The canonical patch message body contains the following:
  444. - A ``from`` line specifying the patch author, followed by an empty
  445. line (only needed if the person sending the patch is not the author).
  446. - The body of the explanation, line wrapped at 75 columns, which will
  447. be copied to the permanent changelog to describe this patch.
  448. - An empty line.
  449. - The ``Signed-off-by:`` lines, described above, which will
  450. also go in the changelog.
  451. - A marker line containing simply ``---``.
  452. - Any additional comments not suitable for the changelog.
  453. - The actual patch (``diff`` output).
  454. The Subject line format makes it very easy to sort the emails
  455. alphabetically by subject line - pretty much any email reader will
  456. support that - since because the sequence number is zero-padded,
  457. the numerical and alphabetic sort is the same.
  458. The ``subsystem`` in the email's Subject should identify which
  459. area or subsystem of the kernel is being patched.
  460. The ``summary phrase`` in the email's Subject should concisely
  461. describe the patch which that email contains. The ``summary
  462. phrase`` should not be a filename. Do not use the same ``summary
  463. phrase`` for every patch in a whole patch series (where a ``patch
  464. series`` is an ordered sequence of multiple, related patches).
  465. Bear in mind that the ``summary phrase`` of your email becomes a
  466. globally-unique identifier for that patch. It propagates all the way
  467. into the ``git`` changelog. The ``summary phrase`` may later be used in
  468. developer discussions which refer to the patch. People will want to
  469. google for the ``summary phrase`` to read discussion regarding that
  470. patch. It will also be the only thing that people may quickly see
  471. when, two or three months later, they are going through perhaps
  472. thousands of patches using tools such as ``gitk`` or ``git log
  473. --oneline``.
  474. For these reasons, the ``summary`` must be no more than 70-75
  475. characters, and it must describe both what the patch changes, as well
  476. as why the patch might be necessary. It is challenging to be both
  477. succinct and descriptive, but that is what a well-written summary
  478. should do.
  479. The ``summary phrase`` may be prefixed by tags enclosed in square
  480. brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are
  481. not considered part of the summary phrase, but describe how the patch
  482. should be treated. Common tags might include a version descriptor if
  483. the multiple versions of the patch have been sent out in response to
  484. comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
  485. comments.
  486. If there are four patches in a patch series the individual patches may
  487. be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures that developers
  488. understand the order in which the patches should be applied and that
  489. they have reviewed or applied all of the patches in the patch series.
  490. Here are some good example Subjects::
  491. Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
  492. Subject: [PATCH v2 01/27] x86: fix eflags tracking
  493. Subject: [PATCH v2] sub/sys: Condensed patch summary
  494. Subject: [PATCH v2 M/N] sub/sys: Condensed patch summary
  495. The ``from`` line must be the very first line in the message body,
  496. and has the form:
  497. From: Patch Author <[email protected]>
  498. The ``from`` line specifies who will be credited as the author of the
  499. patch in the permanent changelog. If the ``from`` line is missing,
  500. then the ``From:`` line from the email header will be used to determine
  501. the patch author in the changelog.
  502. The explanation body will be committed to the permanent source
  503. changelog, so should make sense to a competent reader who has long since
  504. forgotten the immediate details of the discussion that might have led to
  505. this patch. Including symptoms of the failure which the patch addresses
  506. (kernel log messages, oops messages, etc.) are especially useful for
  507. people who might be searching the commit logs looking for the applicable
  508. patch. The text should be written in such detail so that when read
  509. weeks, months or even years later, it can give the reader the needed
  510. details to grasp the reasoning for **why** the patch was created.
  511. If a patch fixes a compile failure, it may not be necessary to include
  512. _all_ of the compile failures; just enough that it is likely that
  513. someone searching for the patch can find it. As in the ``summary
  514. phrase``, it is important to be both succinct as well as descriptive.
  515. The ``---`` marker line serves the essential purpose of marking for
  516. patch handling tools where the changelog message ends.
  517. One good use for the additional comments after the ``---`` marker is
  518. for a ``diffstat``, to show what files have changed, and the number of
  519. inserted and deleted lines per file. A ``diffstat`` is especially useful
  520. on bigger patches. If you are going to include a ``diffstat`` after the
  521. ``---`` marker, please use ``diffstat`` options ``-p 1 -w 70`` so that
  522. filenames are listed from the top of the kernel source tree and don't
  523. use too much horizontal space (easily fit in 80 columns, maybe with some
  524. indentation). (``git`` generates appropriate diffstats by default.)
  525. Other comments relevant only to the moment or the maintainer, not
  526. suitable for the permanent changelog, should also go here. A good
  527. example of such comments might be ``patch changelogs`` which describe
  528. what has changed between the v1 and v2 version of the patch.
  529. Please put this information **after** the ``---`` line which separates
  530. the changelog from the rest of the patch. The version information is
  531. not part of the changelog which gets committed to the git tree. It is
  532. additional information for the reviewers. If it's placed above the
  533. commit tags, it needs manual interaction to remove it. If it is below
  534. the separator line, it gets automatically stripped off when applying the
  535. patch::
  536. <commit message>
  537. ...
  538. Signed-off-by: Author <author@mail>
  539. ---
  540. V2 -> V3: Removed redundant helper function
  541. V1 -> V2: Cleaned up coding style and addressed review comments
  542. path/to/file | 5+++--
  543. ...
  544. See more details on the proper patch format in the following
  545. references.
  546. .. _backtraces:
  547. Backtraces in commit messages
  548. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  549. Backtraces help document the call chain leading to a problem. However,
  550. not all backtraces are helpful. For example, early boot call chains are
  551. unique and obvious. Copying the full dmesg output verbatim, however,
  552. adds distracting information like timestamps, module lists, register and
  553. stack dumps.
  554. Therefore, the most useful backtraces should distill the relevant
  555. information from the dump, which makes it easier to focus on the real
  556. issue. Here is an example of a well-trimmed backtrace::
  557. unchecked MSR access error: WRMSR to 0xd51 (tried to write 0x0000000000000064)
  558. at rIP: 0xffffffffae059994 (native_write_msr+0x4/0x20)
  559. Call Trace:
  560. mba_wrmsr
  561. update_domains
  562. rdtgroup_mkdir
  563. .. _explicit_in_reply_to:
  564. Explicit In-Reply-To headers
  565. ----------------------------
  566. It can be helpful to manually add In-Reply-To: headers to a patch
  567. (e.g., when using ``git send-email``) to associate the patch with
  568. previous relevant discussion, e.g. to link a bug fix to the email with
  569. the bug report. However, for a multi-patch series, it is generally
  570. best to avoid using In-Reply-To: to link to older versions of the
  571. series. This way multiple versions of the patch don't become an
  572. unmanageable forest of references in email clients. If a link is
  573. helpful, you can use the https://lore.kernel.org/ redirector (e.g., in
  574. the cover email text) to link to an earlier version of the patch series.
  575. Providing base tree information
  576. -------------------------------
  577. When other developers receive your patches and start the review process,
  578. it is often useful for them to know where in the tree history they
  579. should place your work. This is particularly useful for automated CI
  580. processes that attempt to run a series of tests in order to establish
  581. the quality of your submission before the maintainer starts the review.
  582. If you are using ``git format-patch`` to generate your patches, you can
  583. automatically include the base tree information in your submission by
  584. using the ``--base`` flag. The easiest and most convenient way to use
  585. this option is with topical branches::
  586. $ git checkout -t -b my-topical-branch master
  587. Branch 'my-topical-branch' set up to track local branch 'master'.
  588. Switched to a new branch 'my-topical-branch'
  589. [perform your edits and commits]
  590. $ git format-patch --base=auto --cover-letter -o outgoing/ master
  591. outgoing/0000-cover-letter.patch
  592. outgoing/0001-First-Commit.patch
  593. outgoing/...
  594. When you open ``outgoing/0000-cover-letter.patch`` for editing, you will
  595. notice that it will have the ``base-commit:`` trailer at the very
  596. bottom, which provides the reviewer and the CI tools enough information
  597. to properly perform ``git am`` without worrying about conflicts::
  598. $ git checkout -b patch-review [base-commit-id]
  599. Switched to a new branch 'patch-review'
  600. $ git am patches.mbox
  601. Applying: First Commit
  602. Applying: ...
  603. Please see ``man git-format-patch`` for more information about this
  604. option.
  605. .. note::
  606. The ``--base`` feature was introduced in git version 2.9.0.
  607. If you are not using git to format your patches, you can still include
  608. the same ``base-commit`` trailer to indicate the commit hash of the tree
  609. on which your work is based. You should add it either in the cover
  610. letter or in the first patch of the series and it should be placed
  611. either below the ``---`` line or at the very bottom of all other
  612. content, right before your email signature.
  613. References
  614. ----------
  615. Andrew Morton, "The perfect patch" (tpp).
  616. <https://www.ozlabs.org/~akpm/stuff/tpp.txt>
  617. Jeff Garzik, "Linux kernel patch submission format".
  618. <https://web.archive.org/web/20180829112450/http://linux.yyz.us/patch-format.html>
  619. Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
  620. <http://www.kroah.com/log/linux/maintainer.html>
  621. <http://www.kroah.com/log/linux/maintainer-02.html>
  622. <http://www.kroah.com/log/linux/maintainer-03.html>
  623. <http://www.kroah.com/log/linux/maintainer-04.html>
  624. <http://www.kroah.com/log/linux/maintainer-05.html>
  625. <http://www.kroah.com/log/linux/maintainer-06.html>
  626. NO!!!! No more huge patch bombs to [email protected] people!
  627. <https://lore.kernel.org/r/[email protected]>
  628. Kernel Documentation/process/coding-style.rst
  629. Linus Torvalds's mail on the canonical patch format:
  630. <https://lore.kernel.org/r/[email protected]>
  631. Andi Kleen, "On submitting kernel patches"
  632. Some strategies to get difficult or controversial changes in.
  633. http://halobates.de/on-submitting-patches.pdf