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