SubmittingPatches 32 KB

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