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