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