SubmittingPatches 36 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821
  1. How to Get Your Change Into the Linux Kernel
  2. or
  3. Care And Operation Of Your Linus Torvalds
  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/development-process. Also, read
  11. Documentation/SubmitChecklist for a list of items to check before
  12. submitting code. If you are submitting a driver, also read
  13. Documentation/SubmittingDrivers; for device tree binding patches, read
  14. Documentation/devicetree/bindings/submitting-patches.txt.
  15. Many of these steps describe the default behavior of the git version
  16. control system; if you use git to prepare your patches, you'll find much
  17. of the mechanical work done for you, though you'll still need to prepare
  18. and document a sensible set of patches. In general, use of git will make
  19. your life as a kernel developer easier.
  20. --------------------------------------------
  21. SECTION 1 - CREATING AND SENDING YOUR CHANGE
  22. --------------------------------------------
  23. 0) Obtain a current source tree
  24. -------------------------------
  25. If you do not have a repository with the current kernel source handy, use
  26. git to obtain one. You'll want to start with the mainline repository,
  27. which can be grabbed with:
  28. git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  29. Note, however, that you may not want to develop against the mainline tree
  30. directly. Most subsystem maintainers run their own trees and want to see
  31. patches prepared against those trees. See the "T:" entry for the subsystem
  32. in the MAINTAINERS file to find that tree, or simply ask the maintainer if
  33. the tree is not listed there.
  34. It is still possible to download kernel releases via tarballs (as described
  35. in the next section), but that is the hard way to do kernel development.
  36. 1) "diff -up"
  37. ------------
  38. If you must generate your patches by hand, use "diff -up" or "diff -uprN"
  39. to create patches. Git generates patches in this form by default; if
  40. you're using git, you can skip this section entirely.
  41. All changes to the Linux kernel occur in the form of patches, as
  42. generated by diff(1). When creating your patch, make sure to create it
  43. in "unified diff" format, as supplied by the '-u' argument to diff(1).
  44. Also, please use the '-p' argument which shows which C function each
  45. change is in - that makes the resultant diff a lot easier to read.
  46. Patches should be based in the root kernel source directory,
  47. not in any lower subdirectory.
  48. To create a patch for a single file, it is often sufficient to do:
  49. SRCTREE= linux
  50. MYFILE= drivers/net/mydriver.c
  51. cd $SRCTREE
  52. cp $MYFILE $MYFILE.orig
  53. vi $MYFILE # make your change
  54. cd ..
  55. diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch
  56. To create a patch for multiple files, you should unpack a "vanilla",
  57. or unmodified kernel source tree, and generate a diff against your
  58. own source tree. For example:
  59. MYSRC= /devel/linux
  60. tar xvfz linux-3.19.tar.gz
  61. mv linux-3.19 linux-3.19-vanilla
  62. diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \
  63. linux-3.19-vanilla $MYSRC > /tmp/patch
  64. "dontdiff" is a list of files which are generated by the kernel during
  65. the build process, and should be ignored in any diff(1)-generated
  66. patch.
  67. Make sure your patch does not include any extra files which do not
  68. belong in a patch submission. Make sure to review your patch -after-
  69. generating it with diff(1), to ensure accuracy.
  70. If your changes produce a lot of deltas, you need to split them into
  71. individual patches which modify things in logical stages; see section
  72. #3. This will facilitate review by other kernel developers,
  73. very important if you want your patch accepted.
  74. If you're using git, "git rebase -i" can help you with this process. If
  75. you're not using git, quilt <http://savannah.nongnu.org/projects/quilt>
  76. is another popular alternative.
  77. 2) Describe your changes.
  78. -------------------------
  79. Describe your problem. Whether your patch is a one-line bug fix or
  80. 5000 lines of a new feature, there must be an underlying problem that
  81. motivated you to do this work. Convince the reviewer that there is a
  82. problem worth fixing and that it makes sense for them to read past the
  83. first paragraph.
  84. Describe user-visible impact. Straight up crashes and lockups are
  85. pretty convincing, but not all bugs are that blatant. Even if the
  86. problem was spotted during code review, describe the impact you think
  87. it can have on users. Keep in mind that the majority of Linux
  88. installations run kernels from secondary stable trees or
  89. vendor/product-specific trees that cherry-pick only specific patches
  90. from upstream, so include anything that could help route your change
  91. downstream: provoking circumstances, excerpts from dmesg, crash
  92. descriptions, performance regressions, latency spikes, lockups, etc.
  93. Quantify optimizations and trade-offs. If you claim improvements in
  94. performance, memory consumption, stack footprint, or binary size,
  95. include numbers that back them up. But also describe non-obvious
  96. costs. Optimizations usually aren't free but trade-offs between CPU,
  97. memory, and readability; or, when it comes to heuristics, between
  98. different workloads. Describe the expected downsides of your
  99. optimization so that the reviewer can weigh costs against benefits.
  100. Once the problem is established, describe what you are actually doing
  101. about it in technical detail. It's important to describe the change
  102. in plain English for the reviewer to verify that the code is behaving
  103. as you intend it to.
  104. The maintainer will thank you if you write your patch description in a
  105. form which can be easily pulled into Linux's source code management
  106. system, git, as a "commit log". See #15, below.
  107. Solve only one problem per patch. If your description starts to get
  108. long, that's a sign that you probably need to split up your patch.
  109. See #3, next.
  110. When you submit or resubmit a patch or patch series, include the
  111. complete patch description and justification for it. Don't just
  112. say that this is version N of the patch (series). Don't expect the
  113. subsystem maintainer to refer back to earlier patch versions or referenced
  114. URLs to find the patch description and put that into the patch.
  115. I.e., the patch (series) and its description should be self-contained.
  116. This benefits both the maintainers and reviewers. Some reviewers
  117. probably didn't even receive earlier versions of the patch.
  118. Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
  119. instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
  120. to do frotz", as if you are giving orders to the codebase to change
  121. its behaviour.
  122. If the patch fixes a logged bug entry, refer to that bug entry by
  123. number and URL. If the patch follows from a mailing list discussion,
  124. give a URL to the mailing list archive; use the https://lkml.kernel.org/
  125. redirector with a Message-Id, to ensure that the links cannot become
  126. stale.
  127. However, try to make your explanation understandable without external
  128. resources. In addition to giving a URL to a mailing list archive or
  129. bug, summarize the relevant points of the discussion that led to the
  130. patch as submitted.
  131. If you want to refer to a specific commit, don't just refer to the
  132. SHA-1 ID of the commit. Please also include the oneline summary of
  133. the commit, to make it easier for reviewers to know what it is about.
  134. Example:
  135. Commit e21d2170f36602ae2708 ("video: remove unnecessary
  136. platform_set_drvdata()") removed the unnecessary
  137. platform_set_drvdata(), but left the variable "dev" unused,
  138. delete it.
  139. You should also be sure to use at least the first twelve characters of the
  140. SHA-1 ID. The kernel repository holds a *lot* of objects, making
  141. collisions with shorter IDs a real possibility. Bear in mind that, even if
  142. there is no collision with your six-character ID now, that condition may
  143. change five years from now.
  144. If your patch fixes a bug in a specific commit, e.g. you found an issue using
  145. git-bisect, please use the 'Fixes:' tag with the first 12 characters of the
  146. SHA-1 ID, and the one line summary. For example:
  147. Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")
  148. The following git-config settings can be used to add a pretty format for
  149. outputting the above style in the git log or git show commands
  150. [core]
  151. abbrev = 12
  152. [pretty]
  153. fixes = Fixes: %h (\"%s\")
  154. 3) Separate your changes.
  155. -------------------------
  156. Separate each _logical change_ into a separate patch.
  157. For example, if your changes include both bug fixes and performance
  158. enhancements for a single driver, separate those changes into two
  159. or more patches. If your changes include an API update, and a new
  160. driver which uses that new API, separate those into two patches.
  161. On the other hand, if you make a single change to numerous files,
  162. group those changes into a single patch. Thus a single logical change
  163. is contained within a single patch.
  164. The point to remember is that each patch should make an easily understood
  165. change that can be verified by reviewers. Each patch should be justifiable
  166. on its own merits.
  167. If one patch depends on another patch in order for a change to be
  168. complete, that is OK. Simply note "this patch depends on patch X"
  169. in your patch description.
  170. When dividing your change into a series of patches, take special care to
  171. ensure that the kernel builds and runs properly after each patch in the
  172. series. Developers using "git bisect" to track down a problem can end up
  173. splitting your patch series at any point; they will not thank you if you
  174. introduce bugs in the middle.
  175. If you cannot condense your patch set into a smaller set of patches,
  176. then only post say 15 or so at a time and wait for review and integration.
  177. 4) Style-check your changes.
  178. ----------------------------
  179. Check your patch for basic style violations, details of which can be
  180. found in Documentation/CodingStyle. Failure to do so simply wastes
  181. the reviewers time and will get your patch rejected, probably
  182. without even being read.
  183. One significant exception is when moving code from one file to
  184. another -- in this case you should not modify the moved code at all in
  185. the same patch which moves it. This clearly delineates the act of
  186. moving the code and your changes. This greatly aids review of the
  187. actual differences and allows tools to better track the history of
  188. the code itself.
  189. Check your patches with the patch style checker prior to submission
  190. (scripts/checkpatch.pl). Note, though, that the style checker should be
  191. viewed as a guide, not as a replacement for human judgment. If your code
  192. looks better with a violation then its probably best left alone.
  193. The checker reports at three levels:
  194. - ERROR: things that are very likely to be wrong
  195. - WARNING: things requiring careful review
  196. - CHECK: things requiring thought
  197. You should be able to justify all violations that remain in your
  198. patch.
  199. 5) Select the recipients for your patch.
  200. ----------------------------------------
  201. You should always copy the appropriate subsystem maintainer(s) on any patch
  202. to code that they maintain; look through the MAINTAINERS file and the
  203. source code revision history to see who those maintainers are. The
  204. script scripts/get_maintainer.pl can be very useful at this step. If you
  205. cannot find a maintainer for the subsystem you are working on, Andrew
  206. Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
  207. You should also normally choose at least one mailing list to receive a copy
  208. of your patch set. linux-kernel@vger.kernel.org functions as a list of
  209. last resort, but the volume on that list has caused a number of developers
  210. to tune it out. Look in the MAINTAINERS file for a subsystem-specific
  211. list; your patch will probably get more attention there. Please do not
  212. spam unrelated lists, though.
  213. Many kernel-related lists are hosted on vger.kernel.org; you can find a
  214. list of them at http://vger.kernel.org/vger-lists.html. There are
  215. kernel-related lists hosted elsewhere as well, though.
  216. Do not send more than 15 patches at once to the vger mailing lists!!!
  217. Linus Torvalds is the final arbiter of all changes accepted into the
  218. Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
  219. He gets a lot of e-mail, and, at this point, very few patches go through
  220. Linus directly, so typically you should do your best to -avoid-
  221. sending him e-mail.
  222. If you have a patch that fixes an exploitable security bug, send that patch
  223. to security@kernel.org. For severe bugs, a short embargo may be considered
  224. to allow distributors to get the patch out to users; in such cases,
  225. obviously, the patch should not be sent to any public lists.
  226. Patches that fix a severe bug in a released kernel should be directed
  227. toward the stable maintainers by putting a line like this:
  228. Cc: stable@vger.kernel.org
  229. into the sign-off area of your patch (note, NOT an email recipient). You
  230. should also read Documentation/stable_kernel_rules.txt in addition to this
  231. file.
  232. Note, however, that some subsystem maintainers want to come to their own
  233. conclusions on which patches should go to the stable trees. The networking
  234. maintainer, in particular, would rather not see individual developers
  235. adding lines like the above to their patches.
  236. If changes affect userland-kernel interfaces, please send the MAN-PAGES
  237. maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
  238. least a notification of the change, so that some information makes its way
  239. into the manual pages. User-space API changes should also be copied to
  240. linux-api@vger.kernel.org.
  241. For small patches you may want to CC the Trivial Patch Monkey
  242. trivial@kernel.org which collects "trivial" patches. Have a look
  243. into the MAINTAINERS file for its current manager.
  244. Trivial patches must qualify for one of the following rules:
  245. Spelling fixes in documentation
  246. Spelling fixes for errors which could break grep(1)
  247. Warning fixes (cluttering with useless warnings is bad)
  248. Compilation fixes (only if they are actually correct)
  249. Runtime fixes (only if they actually fix things)
  250. Removing use of deprecated functions/macros
  251. Contact detail and documentation fixes
  252. Non-portable code replaced by portable code (even in arch-specific,
  253. since people copy, as long as it's trivial)
  254. Any fix by the author/maintainer of the file (ie. patch monkey
  255. in re-transmission mode)
  256. 6) No MIME, no links, no compression, no attachments. Just plain text.
  257. -----------------------------------------------------------------------
  258. Linus and other kernel developers need to be able to read and comment
  259. on the changes you are submitting. It is important for a kernel
  260. developer to be able to "quote" your changes, using standard e-mail
  261. tools, so that they may comment on specific portions of your code.
  262. For this reason, all patches should be submitted by e-mail "inline".
  263. WARNING: Be wary of your editor's word-wrap corrupting your patch,
  264. if you choose to cut-n-paste your patch.
  265. Do not attach the patch as a MIME attachment, compressed or not.
  266. Many popular e-mail applications will not always transmit a MIME
  267. attachment as plain text, making it impossible to comment on your
  268. code. A MIME attachment also takes Linus a bit more time to process,
  269. decreasing the likelihood of your MIME-attached change being accepted.
  270. Exception: If your mailer is mangling patches then someone may ask
  271. you to re-send them using MIME.
  272. See Documentation/email-clients.txt for hints about configuring
  273. your e-mail client so that it sends your patches untouched.
  274. 7) E-mail size.
  275. ---------------
  276. Large changes are not appropriate for mailing lists, and some
  277. maintainers. If your patch, uncompressed, exceeds 300 kB in size,
  278. it is preferred that you store your patch on an Internet-accessible
  279. server, and provide instead a URL (link) pointing to your patch. But note
  280. that if your patch exceeds 300 kB, it almost certainly needs to be broken up
  281. anyway.
  282. 8) Respond to review comments.
  283. ------------------------------
  284. Your patch will almost certainly get comments from reviewers on ways in
  285. which the patch can be improved. You must respond to those comments;
  286. ignoring reviewers is a good way to get ignored in return. Review comments
  287. or questions that do not lead to a code change should almost certainly
  288. bring about a comment or changelog entry so that the next reviewer better
  289. understands what is going on.
  290. Be sure to tell the reviewers what changes you are making and to thank them
  291. for their time. Code review is a tiring and time-consuming process, and
  292. reviewers sometimes get grumpy. Even in that case, though, respond
  293. politely and address the problems they have pointed out.
  294. 9) Don't get discouraged - or impatient.
  295. ----------------------------------------
  296. After you have submitted your change, be patient and wait. Reviewers are
  297. busy people and may not get to your patch right away.
  298. Once upon a time, patches used to disappear into the void without comment,
  299. but the development process works more smoothly than that now. You should
  300. receive comments within a week or so; if that does not happen, make sure
  301. that you have sent your patches to the right place. Wait for a minimum of
  302. one week before resubmitting or pinging reviewers - possibly longer during
  303. busy times like merge windows.
  304. 10) Include PATCH in the subject
  305. --------------------------------
  306. Due to high e-mail traffic to Linus, and to linux-kernel, it is common
  307. convention to prefix your subject line with [PATCH]. This lets Linus
  308. and other kernel developers more easily distinguish patches from other
  309. e-mail discussions.
  310. 11) Sign your work
  311. ------------------
  312. To improve tracking of who did what, especially with patches that can
  313. percolate to their final resting place in the kernel through several
  314. layers of maintainers, we've introduced a "sign-off" procedure on
  315. patches that are being emailed around.
  316. The sign-off is a simple line at the end of the explanation for the
  317. patch, which certifies that you wrote it or otherwise have the right to
  318. pass it on as an open-source patch. The rules are pretty simple: if you
  319. can certify the below:
  320. Developer's Certificate of Origin 1.1
  321. By making a contribution to this project, I certify that:
  322. (a) The contribution was created in whole or in part by me and I
  323. have the right to submit it under the open source license
  324. indicated in the file; or
  325. (b) The contribution is based upon previous work that, to the best
  326. of my knowledge, is covered under an appropriate open source
  327. license and I have the right under that license to submit that
  328. work with modifications, whether created in whole or in part
  329. by me, under the same open source license (unless I am
  330. permitted to submit under a different license), as indicated
  331. in the file; or
  332. (c) The contribution was provided directly to me by some other
  333. person who certified (a), (b) or (c) and I have not modified
  334. it.
  335. (d) I understand and agree that this project and the contribution
  336. are public and that a record of the contribution (including all
  337. personal information I submit with it, including my sign-off) is
  338. maintained indefinitely and may be redistributed consistent with
  339. this project or the open source license(s) involved.
  340. then you just add a line saying
  341. Signed-off-by: Random J Developer <random@developer.example.org>
  342. using your real name (sorry, no pseudonyms or anonymous contributions.)
  343. Some people also put extra tags at the end. They'll just be ignored for
  344. now, but you can do this to mark internal company procedures or just
  345. point out some special detail about the sign-off.
  346. If you are a subsystem or branch maintainer, sometimes you need to slightly
  347. modify patches you receive in order to merge them, because the code is not
  348. exactly the same in your tree and the submitters'. If you stick strictly to
  349. rule (c), you should ask the submitter to rediff, but this is a totally
  350. counter-productive waste of time and energy. Rule (b) allows you to adjust
  351. the code, but then it is very impolite to change one submitter's code and
  352. make him endorse your bugs. To solve this problem, it is recommended that
  353. you add a line between the last Signed-off-by header and yours, indicating
  354. the nature of your changes. While there is nothing mandatory about this, it
  355. seems like prepending the description with your mail and/or name, all
  356. enclosed in square brackets, is noticeable enough to make it obvious that
  357. you are responsible for last-minute changes. Example :
  358. Signed-off-by: Random J Developer <random@developer.example.org>
  359. [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
  360. Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
  361. This practice is particularly helpful if you maintain a stable branch and
  362. want at the same time to credit the author, track changes, merge the fix,
  363. and protect the submitter from complaints. Note that under no circumstances
  364. can you change the author's identity (the From header), as it is the one
  365. which appears in the changelog.
  366. Special note to back-porters: It seems to be a common and useful practice
  367. to insert an indication of the origin of a patch at the top of the commit
  368. message (just after the subject line) to facilitate tracking. For instance,
  369. here's what we see in a 3.x-stable release:
  370. Date: Tue Oct 7 07:26:38 2014 -0400
  371. libata: Un-break ATA blacklist
  372. commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
  373. And here's what might appear in an older kernel once a patch is backported:
  374. Date: Tue May 13 22:12:27 2008 +0200
  375. wireless, airo: waitbusy() won't delay
  376. [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
  377. Whatever the format, this information provides a valuable help to people
  378. tracking your trees, and to people trying to troubleshoot bugs in your
  379. tree.
  380. 12) When to use Acked-by: and Cc:
  381. ---------------------------------
  382. The Signed-off-by: tag indicates that the signer was involved in the
  383. development of the patch, or that he/she was in the patch's delivery path.
  384. If a person was not directly involved in the preparation or handling of a
  385. patch but wishes to signify and record their approval of it then they can
  386. ask to have an Acked-by: line added to the patch's changelog.
  387. Acked-by: is often used by the maintainer of the affected code when that
  388. maintainer neither contributed to nor forwarded the patch.
  389. Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
  390. has at least reviewed the patch and has indicated acceptance. Hence patch
  391. mergers will sometimes manually convert an acker's "yep, looks good to me"
  392. into an Acked-by: (but note that it is usually better to ask for an
  393. explicit ack).
  394. Acked-by: does not necessarily indicate acknowledgement of the entire patch.
  395. For example, if a patch affects multiple subsystems and has an Acked-by: from
  396. one subsystem maintainer then this usually indicates acknowledgement of just
  397. the part which affects that maintainer's code. Judgement should be used here.
  398. When in doubt people should refer to the original discussion in the mailing
  399. list archives.
  400. If a person has had the opportunity to comment on a patch, but has not
  401. provided such comments, you may optionally add a "Cc:" tag to the patch.
  402. This is the only tag which might be added without an explicit action by the
  403. person it names - but it should indicate that this person was copied on the
  404. patch. This tag documents that potentially interested parties
  405. have been included in the discussion.
  406. 13) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
  407. --------------------------------------------------------------------------
  408. The Reported-by tag gives credit to people who find bugs and report them and it
  409. hopefully inspires them to help us again in the future. Please note that if
  410. the bug was reported in private, then ask for permission first before using the
  411. Reported-by tag.
  412. A Tested-by: tag indicates that the patch has been successfully tested (in
  413. some environment) by the person named. This tag informs maintainers that
  414. some testing has been performed, provides a means to locate testers for
  415. future patches, and ensures credit for the testers.
  416. Reviewed-by:, instead, indicates that the patch has been reviewed and found
  417. acceptable according to the Reviewer's Statement:
  418. Reviewer's statement of oversight
  419. By offering my Reviewed-by: tag, I state that:
  420. (a) I have carried out a technical review of this patch to
  421. evaluate its appropriateness and readiness for inclusion into
  422. the mainline kernel.
  423. (b) Any problems, concerns, or questions relating to the patch
  424. have been communicated back to the submitter. I am satisfied
  425. with the submitter's response to my comments.
  426. (c) While there may be things that could be improved with this
  427. submission, I believe that it is, at this time, (1) a
  428. worthwhile modification to the kernel, and (2) free of known
  429. issues which would argue against its inclusion.
  430. (d) While I have reviewed the patch and believe it to be sound, I
  431. do not (unless explicitly stated elsewhere) make any
  432. warranties or guarantees that it will achieve its stated
  433. purpose or function properly in any given situation.
  434. A Reviewed-by tag is a statement of opinion that the patch is an
  435. appropriate modification of the kernel without any remaining serious
  436. technical issues. Any interested reviewer (who has done the work) can
  437. offer a Reviewed-by tag for a patch. This tag serves to give credit to
  438. reviewers and to inform maintainers of the degree of review which has been
  439. done on the patch. Reviewed-by: tags, when supplied by reviewers known to
  440. understand the subject area and to perform thorough reviews, will normally
  441. increase the likelihood of your patch getting into the kernel.
  442. A Suggested-by: tag indicates that the patch idea is suggested by the person
  443. named and ensures credit to the person for the idea. Please note that this
  444. tag should not be added without the reporter's permission, especially if the
  445. idea was not posted in a public forum. That said, if we diligently credit our
  446. idea reporters, they will, hopefully, be inspired to help us again in the
  447. future.
  448. A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
  449. is used to make it easy to determine where a bug originated, which can help
  450. review a bug fix. This tag also assists the stable kernel team in determining
  451. which stable kernel versions should receive your fix. This is the preferred
  452. method for indicating a bug fixed by the patch. See #2 above for more details.
  453. 14) The canonical patch format
  454. ------------------------------
  455. This section describes how the patch itself should be formatted. Note
  456. that, if you have your patches stored in a git repository, proper patch
  457. formatting can be had with "git format-patch". The tools cannot create
  458. the necessary text, though, so read the instructions below anyway.
  459. The canonical patch subject line is:
  460. Subject: [PATCH 001/123] subsystem: summary phrase
  461. The canonical patch message body contains the following:
  462. - A "from" line specifying the patch author (only needed if the person
  463. sending the patch is not the author).
  464. - An empty line.
  465. - The body of the explanation, line wrapped at 75 columns, which will
  466. be copied to the permanent changelog to describe this patch.
  467. - The "Signed-off-by:" lines, described above, which will
  468. also go in the changelog.
  469. - A marker line containing simply "---".
  470. - Any additional comments not suitable for the changelog.
  471. - The actual patch (diff output).
  472. The Subject line format makes it very easy to sort the emails
  473. alphabetically by subject line - pretty much any email reader will
  474. support that - since because the sequence number is zero-padded,
  475. the numerical and alphabetic sort is the same.
  476. The "subsystem" in the email's Subject should identify which
  477. area or subsystem of the kernel is being patched.
  478. The "summary phrase" in the email's Subject should concisely
  479. describe the patch which that email contains. The "summary
  480. phrase" should not be a filename. Do not use the same "summary
  481. phrase" for every patch in a whole patch series (where a "patch
  482. series" is an ordered sequence of multiple, related patches).
  483. Bear in mind that the "summary phrase" of your email becomes a
  484. globally-unique identifier for that patch. It propagates all the way
  485. into the git changelog. The "summary phrase" may later be used in
  486. developer discussions which refer to the patch. People will want to
  487. google for the "summary phrase" to read discussion regarding that
  488. patch. It will also be the only thing that people may quickly see
  489. when, two or three months later, they are going through perhaps
  490. thousands of patches using tools such as "gitk" or "git log
  491. --oneline".
  492. For these reasons, the "summary" must be no more than 70-75
  493. characters, and it must describe both what the patch changes, as well
  494. as why the patch might be necessary. It is challenging to be both
  495. succinct and descriptive, but that is what a well-written summary
  496. should do.
  497. The "summary phrase" may be prefixed by tags enclosed in square
  498. brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are
  499. not considered part of the summary phrase, but describe how the patch
  500. should be treated. Common tags might include a version descriptor if
  501. the multiple versions of the patch have been sent out in response to
  502. comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
  503. comments. If there are four patches in a patch series the individual
  504. patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
  505. that developers understand the order in which the patches should be
  506. applied and that they have reviewed or applied all of the patches in
  507. the patch series.
  508. A couple of example Subjects:
  509. Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
  510. Subject: [PATCH v2 01/27] x86: fix eflags tracking
  511. The "from" line must be the very first line in the message body,
  512. and has the form:
  513. From: Original Author <author@example.com>
  514. The "from" line specifies who will be credited as the author of the
  515. patch in the permanent changelog. If the "from" line is missing,
  516. then the "From:" line from the email header will be used to determine
  517. the patch author in the changelog.
  518. The explanation body will be committed to the permanent source
  519. changelog, so should make sense to a competent reader who has long
  520. since forgotten the immediate details of the discussion that might
  521. have led to this patch. Including symptoms of the failure which the
  522. patch addresses (kernel log messages, oops messages, etc.) is
  523. especially useful for people who might be searching the commit logs
  524. looking for the applicable patch. If a patch fixes a compile failure,
  525. it may not be necessary to include _all_ of the compile failures; just
  526. enough that it is likely that someone searching for the patch can find
  527. it. As in the "summary phrase", it is important to be both succinct as
  528. well as descriptive.
  529. The "---" marker line serves the essential purpose of marking for patch
  530. handling tools where the changelog message ends.
  531. One good use for the additional comments after the "---" marker is for
  532. a diffstat, to show what files have changed, and the number of
  533. inserted and deleted lines per file. A diffstat is especially useful
  534. on bigger patches. Other comments relevant only to the moment or the
  535. maintainer, not suitable for the permanent changelog, should also go
  536. here. A good example of such comments might be "patch changelogs"
  537. which describe what has changed between the v1 and v2 version of the
  538. patch.
  539. If you are going to include a diffstat after the "---" marker, please
  540. use diffstat options "-p 1 -w 70" so that filenames are listed from
  541. the top of the kernel source tree and don't use too much horizontal
  542. space (easily fit in 80 columns, maybe with some indentation). (git
  543. generates appropriate diffstats by default.)
  544. See more details on the proper patch format in the following
  545. references.
  546. 15) Explicit In-Reply-To headers
  547. --------------------------------
  548. It can be helpful to manually add In-Reply-To: headers to a patch
  549. (e.g., when using "git send email") to associate the patch with
  550. previous relevant discussion, e.g. to link a bug fix to the email with
  551. the bug report. However, for a multi-patch series, it is generally
  552. best to avoid using In-Reply-To: to link to older versions of the
  553. series. This way multiple versions of the patch don't become an
  554. unmanageable forest of references in email clients. If a link is
  555. helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in
  556. the cover email text) to link to an earlier version of the patch series.
  557. 16) Sending "git pull" requests
  558. -------------------------------
  559. If you have a series of patches, it may be most convenient to have the
  560. maintainer pull them directly into the subsystem repository with a
  561. "git pull" operation. Note, however, that pulling patches from a developer
  562. requires a higher degree of trust than taking patches from a mailing list.
  563. As a result, many subsystem maintainers are reluctant to take pull
  564. requests, especially from new, unknown developers. If in doubt you can use
  565. the pull request as the cover letter for a normal posting of the patch
  566. series, giving the maintainer the option of using either.
  567. A pull request should have [GIT] or [PULL] in the subject line. The
  568. request itself should include the repository name and the branch of
  569. interest on a single line; it should look something like:
  570. Please pull from
  571. git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
  572. to get these changes:
  573. A pull request should also include an overall message saying what will be
  574. included in the request, a "git shortlog" listing of the patches
  575. themselves, and a diffstat showing the overall effect of the patch series.
  576. The easiest way to get all this information together is, of course, to let
  577. git do it for you with the "git request-pull" command.
  578. Some maintainers (including Linus) want to see pull requests from signed
  579. commits; that increases their confidence that the request actually came
  580. from you. Linus, in particular, will not pull from public hosting sites
  581. like GitHub in the absence of a signed tag.
  582. The first step toward creating such tags is to make a GNUPG key and get it
  583. signed by one or more core kernel developers. This step can be hard for
  584. new developers, but there is no way around it. Attending conferences can
  585. be a good way to find developers who can sign your key.
  586. Once you have prepared a patch series in git that you wish to have somebody
  587. pull, create a signed tag with "git tag -s". This will create a new tag
  588. identifying the last commit in the series and containing a signature
  589. created with your private key. You will also have the opportunity to add a
  590. changelog-style message to the tag; this is an ideal place to describe the
  591. effects of the pull request as a whole.
  592. If the tree the maintainer will be pulling from is not the repository you
  593. are working from, don't forget to push the signed tag explicitly to the
  594. public tree.
  595. When generating your pull request, use the signed tag as the target. A
  596. command like this will do the trick:
  597. git request-pull master git://my.public.tree/linux.git my-signed-tag
  598. ----------------------
  599. SECTION 2 - REFERENCES
  600. ----------------------
  601. Andrew Morton, "The perfect patch" (tpp).
  602. <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
  603. Jeff Garzik, "Linux kernel patch submission format".
  604. <http://linux.yyz.us/patch-format.html>
  605. Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
  606. <http://www.kroah.com/log/linux/maintainer.html>
  607. <http://www.kroah.com/log/linux/maintainer-02.html>
  608. <http://www.kroah.com/log/linux/maintainer-03.html>
  609. <http://www.kroah.com/log/linux/maintainer-04.html>
  610. <http://www.kroah.com/log/linux/maintainer-05.html>
  611. <http://www.kroah.com/log/linux/maintainer-06.html>
  612. NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
  613. <https://lkml.org/lkml/2005/7/11/336>
  614. Kernel Documentation/CodingStyle:
  615. <Documentation/CodingStyle>
  616. Linus Torvalds's mail on the canonical patch format:
  617. <http://lkml.org/lkml/2005/4/7/183>
  618. Andi Kleen, "On submitting kernel patches"
  619. Some strategies to get difficult or controversial changes in.
  620. http://halobates.de/on-submitting-patches.pdf
  621. --