SubmittingPatches 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374
  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. If you are submitting a driver, also read Documentation/SubmittingDrivers.
  9. --------------------------------------------
  10. SECTION 1 - CREATING AND SENDING YOUR CHANGE
  11. --------------------------------------------
  12. 1) "diff -up"
  13. ------------
  14. Use "diff -up" or "diff -uprN" to create patches.
  15. All changes to the Linux kernel occur in the form of patches, as
  16. generated by diff(1). When creating your patch, make sure to create it
  17. in "unified diff" format, as supplied by the '-u' argument to diff(1).
  18. Also, please use the '-p' argument which shows which C function each
  19. change is in - that makes the resultant diff a lot easier to read.
  20. Patches should be based in the root kernel source directory,
  21. not in any lower subdirectory.
  22. To create a patch for a single file, it is often sufficient to do:
  23. SRCTREE= linux-2.4
  24. MYFILE= drivers/net/mydriver.c
  25. cd $SRCTREE
  26. cp $MYFILE $MYFILE.orig
  27. vi $MYFILE # make your change
  28. cd ..
  29. diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch
  30. To create a patch for multiple files, you should unpack a "vanilla",
  31. or unmodified kernel source tree, and generate a diff against your
  32. own source tree. For example:
  33. MYSRC= /devel/linux-2.4
  34. tar xvfz linux-2.4.0-test11.tar.gz
  35. mv linux linux-vanilla
  36. wget http://www.moses.uklinux.net/patches/dontdiff
  37. diff -uprN -X dontdiff linux-vanilla $MYSRC > /tmp/patch
  38. rm -f dontdiff
  39. "dontdiff" is a list of files which are generated by the kernel during
  40. the build process, and should be ignored in any diff(1)-generated
  41. patch. dontdiff is maintained by Tigran Aivazian <tigran@veritas.com>
  42. Make sure your patch does not include any extra files which do not
  43. belong in a patch submission. Make sure to review your patch -after-
  44. generated it with diff(1), to ensure accuracy.
  45. If your changes produce a lot of deltas, you may want to look into
  46. splitting them into individual patches which modify things in
  47. logical stages, this will facilitate easier reviewing by other
  48. kernel developers, very important if you want your patch accepted.
  49. There are a number of scripts which can aid in this;
  50. Quilt:
  51. http://savannah.nongnu.org/projects/quilt
  52. Randy Dunlap's patch scripts:
  53. http://developer.osdl.org/rddunlap/scripts/patching-scripts.tgz
  54. Andrew Morton's patch scripts:
  55. http://www.zip.com.au/~akpm/linux/patches/patch-scripts-0.16
  56. 2) Describe your changes.
  57. Describe the technical detail of the change(s) your patch includes.
  58. Be as specific as possible. The WORST descriptions possible include
  59. things like "update driver X", "bug fix for driver X", or "this patch
  60. includes updates for subsystem X. Please apply."
  61. If your description starts to get long, that's a sign that you probably
  62. need to split up your patch. See #3, next.
  63. 3) Separate your changes.
  64. Separate each logical change into its own patch.
  65. For example, if your changes include both bug fixes and performance
  66. enhancements for a single driver, separate those changes into two
  67. or more patches. If your changes include an API update, and a new
  68. driver which uses that new API, separate those into two patches.
  69. On the other hand, if you make a single change to numerous files,
  70. group those changes into a single patch. Thus a single logical change
  71. is contained within a single patch.
  72. If one patch depends on another patch in order for a change to be
  73. complete, that is OK. Simply note "this patch depends on patch X"
  74. in your patch description.
  75. 4) Select e-mail destination.
  76. Look through the MAINTAINERS file and the source code, and determine
  77. if your change applies to a specific subsystem of the kernel, with
  78. an assigned maintainer. If so, e-mail that person.
  79. If no maintainer is listed, or the maintainer does not respond, send
  80. your patch to the primary Linux kernel developer's mailing list,
  81. linux-kernel@vger.kernel.org. Most kernel developers monitor this
  82. e-mail list, and can comment on your changes.
  83. Linus Torvalds is the final arbiter of all changes accepted into the
  84. Linux kernel. His e-mail address is <torvalds@osdl.org>. He gets
  85. a lot of e-mail, so typically you should do your best to -avoid- sending
  86. him e-mail.
  87. Patches which are bug fixes, are "obvious" changes, or similarly
  88. require little discussion should be sent or CC'd to Linus. Patches
  89. which require discussion or do not have a clear advantage should
  90. usually be sent first to linux-kernel. Only after the patch is
  91. discussed should the patch then be submitted to Linus.
  92. For small patches you may want to CC the Trivial Patch Monkey
  93. trivial@rustcorp.com.au set up by Rusty Russell; which collects "trivial"
  94. patches. Trivial patches must qualify for one of the following rules:
  95. Spelling fixes in documentation
  96. Spelling fixes which could break grep(1).
  97. Warning fixes (cluttering with useless warnings is bad)
  98. Compilation fixes (only if they are actually correct)
  99. Runtime fixes (only if they actually fix things)
  100. Removing use of deprecated functions/macros (eg. check_region).
  101. Contact detail and documentation fixes
  102. Non-portable code replaced by portable code (even in arch-specific,
  103. since people copy, as long as it's trivial)
  104. Any fix by the author/maintainer of the file. (ie. patch monkey
  105. in re-transmission mode)
  106. 5) Select your CC (e-mail carbon copy) list.
  107. Unless you have a reason NOT to do so, CC linux-kernel@vger.kernel.org.
  108. Other kernel developers besides Linus need to be aware of your change,
  109. so that they may comment on it and offer code review and suggestions.
  110. linux-kernel is the primary Linux kernel developer mailing list.
  111. Other mailing lists are available for specific subsystems, such as
  112. USB, framebuffer devices, the VFS, the SCSI subsystem, etc. See the
  113. MAINTAINERS file for a mailing list that relates specifically to
  114. your change.
  115. Even if the maintainer did not respond in step #4, make sure to ALWAYS
  116. copy the maintainer when you change their code.
  117. For small patches you may want to CC the Trivial Patch Monkey
  118. trivial@rustcorp.com.au set up by Rusty Russell; which collects "trivial"
  119. patches. Trivial patches must qualify for one of the following rules:
  120. Spelling fixes in documentation
  121. Spelling fixes which could break grep(1).
  122. Warning fixes (cluttering with useless warnings is bad)
  123. Compilation fixes (only if they are actually correct)
  124. Runtime fixes (only if they actually fix things)
  125. Removing use of deprecated functions/macros (eg. check_region).
  126. Contact detail and documentation fixes
  127. Non-portable code replaced by portable code (even in arch-specific,
  128. since people copy, as long as it's trivial)
  129. Any fix by the author/maintainer of the file. (ie. patch monkey
  130. in re-transmission mode)
  131. 6) No MIME, no links, no compression, no attachments. Just plain text.
  132. Linus and other kernel developers need to be able to read and comment
  133. on the changes you are submitting. It is important for a kernel
  134. developer to be able to "quote" your changes, using standard e-mail
  135. tools, so that they may comment on specific portions of your code.
  136. For this reason, all patches should be submitting e-mail "inline".
  137. WARNING: Be wary of your editor's word-wrap corrupting your patch,
  138. if you choose to cut-n-paste your patch.
  139. Do not attach the patch as a MIME attachment, compressed or not.
  140. Many popular e-mail applications will not always transmit a MIME
  141. attachment as plain text, making it impossible to comment on your
  142. code. A MIME attachment also takes Linus a bit more time to process,
  143. decreasing the likelihood of your MIME-attached change being accepted.
  144. Exception: If your mailer is mangling patches then someone may ask
  145. you to re-send them using MIME.
  146. 7) E-mail size.
  147. When sending patches to Linus, always follow step #6.
  148. Large changes are not appropriate for mailing lists, and some
  149. maintainers. If your patch, uncompressed, exceeds 40 kB in size,
  150. it is preferred that you store your patch on an Internet-accessible
  151. server, and provide instead a URL (link) pointing to your patch.
  152. 8) Name your kernel version.
  153. It is important to note, either in the subject line or in the patch
  154. description, the kernel version to which this patch applies.
  155. If the patch does not apply cleanly to the latest kernel version,
  156. Linus will not apply it.
  157. 9) Don't get discouraged. Re-submit.
  158. After you have submitted your change, be patient and wait. If Linus
  159. likes your change and applies it, it will appear in the next version
  160. of the kernel that he releases.
  161. However, if your change doesn't appear in the next version of the
  162. kernel, there could be any number of reasons. It's YOUR job to
  163. narrow down those reasons, correct what was wrong, and submit your
  164. updated change.
  165. It is quite common for Linus to "drop" your patch without comment.
  166. That's the nature of the system. If he drops your patch, it could be
  167. due to
  168. * Your patch did not apply cleanly to the latest kernel version
  169. * Your patch was not sufficiently discussed on linux-kernel.
  170. * A style issue (see section 2),
  171. * An e-mail formatting issue (re-read this section)
  172. * A technical problem with your change
  173. * He gets tons of e-mail, and yours got lost in the shuffle
  174. * You are being annoying (See Figure 1)
  175. When in doubt, solicit comments on linux-kernel mailing list.
  176. 10) Include PATCH in the subject
  177. Due to high e-mail traffic to Linus, and to linux-kernel, it is common
  178. convention to prefix your subject line with [PATCH]. This lets Linus
  179. and other kernel developers more easily distinguish patches from other
  180. e-mail discussions.
  181. 11) Sign your work
  182. To improve tracking of who did what, especially with patches that can
  183. percolate to their final resting place in the kernel through several
  184. layers of maintainers, we've introduced a "sign-off" procedure on
  185. patches that are being emailed around.
  186. The sign-off is a simple line at the end of the explanation for the
  187. patch, which certifies that you wrote it or otherwise have the right to
  188. pass it on as a open-source patch. The rules are pretty simple: if you
  189. can certify the below:
  190. Developer's Certificate of Origin 1.0
  191. By making a contribution to this project, I certify that:
  192. (a) The contribution was created in whole or in part by me and I
  193. have the right to submit it under the open source license
  194. indicated in the file; or
  195. (b) The contribution is based upon previous work that, to the best
  196. of my knowledge, is covered under an appropriate open source
  197. license and I have the right under that license to submit that
  198. work with modifications, whether created in whole or in part
  199. by me, under the same open source license (unless I am
  200. permitted to submit under a different license), as indicated
  201. in the file; or
  202. (c) The contribution was provided directly to me by some other
  203. person who certified (a), (b) or (c) and I have not modified
  204. it.
  205. then you just add a line saying
  206. Signed-off-by: Random J Developer <random@developer.org>
  207. Some people also put extra tags at the end. They'll just be ignored for
  208. now, but you can do this to mark internal company procedures or just
  209. point out some special detail about the sign-off.
  210. -----------------------------------
  211. SECTION 2 - HINTS, TIPS, AND TRICKS
  212. -----------------------------------
  213. This section lists many of the common "rules" associated with code
  214. submitted to the kernel. There are always exceptions... but you must
  215. have a really good reason for doing so. You could probably call this
  216. section Linus Computer Science 101.
  217. 1) Read Documentation/CodingStyle
  218. Nuff said. If your code deviates too much from this, it is likely
  219. to be rejected without further review, and without comment.
  220. 2) #ifdefs are ugly
  221. Code cluttered with ifdefs is difficult to read and maintain. Don't do
  222. it. Instead, put your ifdefs in a header, and conditionally define
  223. 'static inline' functions, or macros, which are used in the code.
  224. Let the compiler optimize away the "no-op" case.
  225. Simple example, of poor code:
  226. dev = alloc_etherdev (sizeof(struct funky_private));
  227. if (!dev)
  228. return -ENODEV;
  229. #ifdef CONFIG_NET_FUNKINESS
  230. init_funky_net(dev);
  231. #endif
  232. Cleaned-up example:
  233. (in header)
  234. #ifndef CONFIG_NET_FUNKINESS
  235. static inline void init_funky_net (struct net_device *d) {}
  236. #endif
  237. (in the code itself)
  238. dev = alloc_etherdev (sizeof(struct funky_private));
  239. if (!dev)
  240. return -ENODEV;
  241. init_funky_net(dev);
  242. 3) 'static inline' is better than a macro
  243. Static inline functions are greatly preferred over macros.
  244. They provide type safety, have no length limitations, no formatting
  245. limitations, and under gcc they are as cheap as macros.
  246. Macros should only be used for cases where a static inline is clearly
  247. suboptimal [there a few, isolated cases of this in fast paths],
  248. or where it is impossible to use a static inline function [such as
  249. string-izing].
  250. 'static inline' is preferred over 'static __inline__', 'extern inline',
  251. and 'extern __inline__'.
  252. 4) Don't over-design.
  253. Don't try to anticipate nebulous future cases which may or may not
  254. be useful: "Make it as simple as you can, and no simpler"