SubmittingPatches 29 KB

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