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