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