docs: fix broken cross reference in translations/zh_CN
[linux-2.6-block.git] / Documentation / process / submitting-patches.rst
CommitLineData
609d99a3 1.. _submittingpatches:
1da177e4 2
89edeedd
JC
3Submitting patches: the essential guide to getting your code into the kernel
4============================================================================
1da177e4
LT
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
d00c4559
JC
11This document contains a large number of suggestions in a relatively terse
12format. For detailed information on how the kernel development process
5ff4aa70
MCC
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`.
1da177e4 17
9f364b60
DD
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.
1da177e4 22
ef227c39
DD
23Obtain a current source tree
24----------------------------
7994cc15
JC
25
26If you do not have a repository with the current kernel source handy, use
9b2c7677 27``git`` to obtain one. You'll want to start with the mainline repository,
5903019b 28which can be grabbed with::
7994cc15 29
5903019b 30 git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
7994cc15
JC
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
5903019b 34patches prepared against those trees. See the **T:** entry for the subsystem
7994cc15
JC
35in the MAINTAINERS file to find that tree, or simply ask the maintainer if
36the tree is not listed there.
37
5903019b 38.. _describe_changes:
84da7c08 39
ef227c39
DD
40Describe your changes
41---------------------
1da177e4 42
7b9828d4
JW
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.
1da177e4 71
2ae19aca
TT
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
9b2c7677 74system, ``git``, as a "commit log". See :ref:`explicit_in_reply_to`.
2ae19aca 75
7b9828d4
JW
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.
5903019b 78See :ref:`split_changes`.
1da177e4 79
d89b1945
RD
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
d00c4559 83subsystem maintainer to refer back to earlier patch versions or referenced
d89b1945
RD
84URLs to find the patch description and put that into the patch.
85I.e., the patch (series) and its description should be self-contained.
d00c4559 86This benefits both the maintainers and reviewers. Some reviewers
d89b1945
RD
87probably didn't even receive earlier versions of the patch.
88
74a475ac
JT
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
d89b1945 94If the patch fixes a logged bug entry, refer to that bug entry by
9547c706
JT
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/
9b2c7677 97redirector with a ``Message-Id``, to ensure that the links cannot become
9547c706
JT
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.
1da177e4 104
0af52703
GU
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.
5903019b 108Example::
0af52703
GU
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
7994cc15
JC
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
8401aa1f 121If your patch fixes a bug in a specific commit, e.g. you found an issue using
9b2c7677 122``git bisect``, please use the 'Fixes:' tag with the first 12 characters of
19c3fe28
SC
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::
8401aa1f 126
19c3fe28 127 Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")
8401aa1f 128
9b2c7677
MCC
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::
8401aa1f
JK
131
132 [core]
133 abbrev = 12
134 [pretty]
135 fixes = Fixes: %h (\"%s\")
1da177e4 136
5b5bbb8c
TR
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
5903019b
MCC
142.. _split_changes:
143
ef227c39
DD
144Separate your changes
145---------------------
1da177e4 146
5903019b 147Separate each **logical change** into a separate patch.
1da177e4
LT
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
d00c4559
JC
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
1da177e4 162If one patch depends on another patch in order for a change to be
5903019b 163complete, that is OK. Simply note **"this patch depends on patch X"**
1da177e4
LT
164in your patch description.
165
7994cc15
JC
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
5903019b 168series. Developers using ``git bisect`` to track down a problem can end up
7994cc15
JC
169splitting your patch series at any point; they will not thank you if you
170introduce bugs in the middle.
171
5b0ed2c6
XVP
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
1da177e4 176
ef227c39
DD
177Style-check your changes
178------------------------
0a920b5b
AW
179
180Check your patch for basic style violations, details of which can be
dca22a63 181found in
8c27ceff 182:ref:`Documentation/process/coding-style.rst <codingstyle>`.
dca22a63 183Failure to do so simply wastes
f56d35e7 184the reviewers time and will get your patch rejected, probably
0a920b5b
AW
185without even being read.
186
6de16eba
JC
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.
0a920b5b 198
6de16eba
JC
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
0a920b5b 203
6de16eba
JC
204You should be able to justify all violations that remain in your
205patch.
0a920b5b
AW
206
207
ef227c39
DD
208Select the recipients for your patch
209------------------------------------
1da177e4 210
ccae8616
JC
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
d6eff078 215cannot find a maintainer for the subsystem you are working on, Andrew
ccae8616 216Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
1da177e4 217
ccae8616
JC
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.
1da177e4 224
ccae8616
JC
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.
5b0ed2c6
XVP
228
229Do not send more than 15 patches at once to the vger mailing lists!!!
230
1da177e4 231Linus Torvalds is the final arbiter of all changes accepted into the
e00bfcbf 232Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
ccae8616
JC
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-
e00bfcbf 235sending him e-mail.
1da177e4 236
ccae8616
JC
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
253508ca 239to allow distributors to get the patch out to users; in such cases,
eb45fb2f 240obviously, the patch should not be sent to any public lists. See also
5ff4aa70 241:doc:`/admin-guide/security-bugs`.
1da177e4 242
ccae8616 243Patches that fix a severe bug in a released kernel should be directed
5903019b 244toward the stable maintainers by putting a line like this::
1da177e4 245
ccae8616 246 Cc: stable@vger.kernel.org
1da177e4 247
8cda4c3a 248into the sign-off area of your patch (note, NOT an email recipient). You
dca22a63 249should also read
8c27ceff 250:ref:`Documentation/process/stable-kernel-rules.rst <stable_kernel_rules>`
dca22a63 251in addition to this file.
1da177e4 252
ccae8616
JC
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.
5b0ed2c6 257
ccae8616
JC
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
5903019b 262linux-api@vger.kernel.org.
1da177e4
LT
263
264For small patches you may want to CC the Trivial Patch Monkey
82d27b2b
MH
265trivial@kernel.org which collects "trivial" patches. Have a look
266into the MAINTAINERS file for its current manager.
5903019b 267
82d27b2b 268Trivial patches must qualify for one of the following rules:
5903019b 269
9b2c7677
MCC
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)
84da7c08 281
1da177e4
LT
282
283
ef227c39
DD
284No MIME, no links, no compression, no attachments. Just plain text
285-------------------------------------------------------------------
1da177e4
LT
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
9f364b60
DD
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``:
9b2c7677
MCC
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.
1da177e4
LT
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
5ff4aa70
MCC
313See :doc:`/process/email-clients` for hints about configuring your e-mail
314client so that it sends your patches untouched.
1da177e4 315
ef227c39
DD
316Respond to review comments
317--------------------------
1da177e4 318
0eea2314 319Your patch will almost certainly get comments from reviewers on ways in
9f364b60
DD
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
0eea2314
JC
324bring about a comment or changelog entry so that the next reviewer better
325understands what is going on.
1da177e4 326
0eea2314
JC
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.
1da177e4 331
5ff4aa70 332See :doc:`email-clients` for recommendations on email
7433ff33
DD
333clients and mailing list etiquette.
334
1da177e4 335
ef227c39
DD
336Don't get discouraged - or impatient
337------------------------------------
1da177e4 338
0eea2314
JC
339After you have submitted your change, be patient and wait. Reviewers are
340busy people and may not get to your patch right away.
1da177e4 341
0eea2314
JC
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.
1da177e4 348
1da177e4 349
ef227c39
DD
350Include PATCH in the subject
351-----------------------------
1da177e4
LT
352
353Due to high e-mail traffic to Linus, and to linux-kernel, it is common
354convention to prefix your subject line with [PATCH]. This lets Linus
355and other kernel developers more easily distinguish patches from other
356e-mail discussions.
357
9f364b60 358``git send-email`` will do this for you automatically.
1da177e4
LT
359
360
ef227c39
DD
361Sign your work - the Developer's Certificate of Origin
362------------------------------------------------------
1da177e4
LT
363
364To improve tracking of who did what, especially with patches that can
365percolate to their final resting place in the kernel through several
366layers of maintainers, we've introduced a "sign-off" procedure on
367patches that are being emailed around.
368
369The sign-off is a simple line at the end of the explanation for the
370patch, which certifies that you wrote it or otherwise have the right to
db12fb83 371pass it on as an open-source patch. The rules are pretty simple: if you
1da177e4
LT
372can certify the below:
373
5903019b
MCC
374Developer's Certificate of Origin 1.1
375^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1da177e4 376
5903019b 377By making a contribution to this project, I certify that:
1da177e4
LT
378
379 (a) The contribution was created in whole or in part by me and I
380 have the right to submit it under the open source license
381 indicated in the file; or
382
383 (b) The contribution is based upon previous work that, to the best
384 of my knowledge, is covered under an appropriate open source
385 license and I have the right under that license to submit that
386 work with modifications, whether created in whole or in part
387 by me, under the same open source license (unless I am
388 permitted to submit under a different license), as indicated
389 in the file; or
390
391 (c) The contribution was provided directly to me by some other
392 person who certified (a), (b) or (c) and I have not modified
393 it.
394
e00bfcbf
SB
395 (d) I understand and agree that this project and the contribution
396 are public and that a record of the contribution (including all
397 personal information I submit with it, including my sign-off) is
398 maintained indefinitely and may be redistributed consistent with
399 this project or the open source license(s) involved.
cbd83da8 400
5903019b 401then you just add a line saying::
1da177e4 402
9fd5559c 403 Signed-off-by: Random J Developer <random@developer.example.org>
1da177e4 404
af45f32d 405using your real name (sorry, no pseudonyms or anonymous contributions.)
9f364b60 406This will be done for you automatically if you use ``git commit -s``.
7d717887
AS
407Reverts should also include "Signed-off-by". ``git revert -s`` does that
408for you.
af45f32d 409
1da177e4
LT
410Some people also put extra tags at the end. They'll just be ignored for
411now, but you can do this to mark internal company procedures or just
e00bfcbf 412point out some special detail about the sign-off.
1da177e4
LT
413
414
ef227c39
DD
415When to use Acked-by:, Cc:, and Co-developed-by:
416------------------------------------------------
0a920b5b 417
0f44cd23
AM
418The Signed-off-by: tag indicates that the signer was involved in the
419development of the patch, or that he/she was in the patch's delivery path.
420
421If a person was not directly involved in the preparation or handling of a
422patch but wishes to signify and record their approval of it then they can
d00c4559 423ask to have an Acked-by: line added to the patch's changelog.
0f44cd23
AM
424
425Acked-by: is often used by the maintainer of the affected code when that
426maintainer neither contributed to nor forwarded the patch.
427
428Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
429has at least reviewed the patch and has indicated acceptance. Hence patch
430mergers will sometimes manually convert an acker's "yep, looks good to me"
d00c4559
JC
431into an Acked-by: (but note that it is usually better to ask for an
432explicit ack).
0f44cd23
AM
433
434Acked-by: does not necessarily indicate acknowledgement of the entire patch.
435For example, if a patch affects multiple subsystems and has an Acked-by: from
436one subsystem maintainer then this usually indicates acknowledgement of just
437the part which affects that maintainer's code. Judgement should be used here.
ef40203a 438When in doubt people should refer to the original discussion in the mailing
0f44cd23
AM
439list archives.
440
ef40203a 441If a person has had the opportunity to comment on a patch, but has not
5903019b 442provided such comments, you may optionally add a ``Cc:`` tag to the patch.
ef40203a 443This is the only tag which might be added without an explicit action by the
d00c4559
JC
444person it names - but it should indicate that this person was copied on the
445patch. This tag documents that potentially interested parties
446have been included in the discussion.
0f44cd23 447
24a2bb90
SC
448Co-developed-by: states that the patch was co-created by multiple developers;
449it is a used to give attribution to co-authors (in addition to the author
450attributed by the From: tag) when several people work on a single patch. Since
451Co-developed-by: denotes authorship, every Co-developed-by: must be immediately
452followed by a Signed-off-by: of the associated co-author. Standard sign-off
453procedure applies, i.e. the ordering of Signed-off-by: tags should reflect the
454chronological history of the patch insofar as possible, regardless of whether
455the author is attributed via From: or Co-developed-by:. Notably, the last
456Signed-off-by: must always be that of the developer submitting the patch.
457
458Note, the From: tag is optional when the From: author is also the person (and
459email) listed in the From: line of the email header.
460
461Example of a patch submitted by the From: author::
462
463 <changelog>
464
465 Co-developed-by: First Co-Author <first@coauthor.example.org>
466 Signed-off-by: First Co-Author <first@coauthor.example.org>
467 Co-developed-by: Second Co-Author <second@coauthor.example.org>
468 Signed-off-by: Second Co-Author <second@coauthor.example.org>
469 Signed-off-by: From Author <from@author.example.org>
470
471Example of a patch submitted by a Co-developed-by: author::
472
473 From: From Author <from@author.example.org>
474
475 <changelog>
476
477 Co-developed-by: Random Co-Author <random@coauthor.example.org>
478 Signed-off-by: Random Co-Author <random@coauthor.example.org>
479 Signed-off-by: From Author <from@author.example.org>
480 Co-developed-by: Submitting Co-Author <sub@coauthor.example.org>
481 Signed-off-by: Submitting Co-Author <sub@coauthor.example.org>
82d95343 482
ef40203a 483
ef227c39
DD
484Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
485----------------------------------------------------------------------
bbb0a424 486
d75ef707
DC
487The Reported-by tag gives credit to people who find bugs and report them and it
488hopefully inspires them to help us again in the future. Please note that if
489the bug was reported in private, then ask for permission first before using the
490Reported-by tag.
ef40203a
JC
491
492A Tested-by: tag indicates that the patch has been successfully tested (in
493some environment) by the person named. This tag informs maintainers that
494some testing has been performed, provides a means to locate testers for
495future patches, and ensures credit for the testers.
496
497Reviewed-by:, instead, indicates that the patch has been reviewed and found
498acceptable according to the Reviewer's Statement:
499
5903019b
MCC
500Reviewer's statement of oversight
501^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ef40203a 502
5903019b 503By offering my Reviewed-by: tag, I state that:
ef40203a 504
5903019b 505 (a) I have carried out a technical review of this patch to
ef40203a
JC
506 evaluate its appropriateness and readiness for inclusion into
507 the mainline kernel.
508
509 (b) Any problems, concerns, or questions relating to the patch
510 have been communicated back to the submitter. I am satisfied
511 with the submitter's response to my comments.
512
513 (c) While there may be things that could be improved with this
514 submission, I believe that it is, at this time, (1) a
515 worthwhile modification to the kernel, and (2) free of known
516 issues which would argue against its inclusion.
517
518 (d) While I have reviewed the patch and believe it to be sound, I
519 do not (unless explicitly stated elsewhere) make any
520 warranties or guarantees that it will achieve its stated
521 purpose or function properly in any given situation.
522
523A Reviewed-by tag is a statement of opinion that the patch is an
524appropriate modification of the kernel without any remaining serious
525technical issues. Any interested reviewer (who has done the work) can
526offer a Reviewed-by tag for a patch. This tag serves to give credit to
527reviewers and to inform maintainers of the degree of review which has been
528done on the patch. Reviewed-by: tags, when supplied by reviewers known to
529understand the subject area and to perform thorough reviews, will normally
5801da1b 530increase the likelihood of your patch getting into the kernel.
ef40203a 531
030f066f
KK
532Both Tested-by and Reviewed-by tags, once received on mailing list from tester
533or reviewer, should be added by author to the applicable patches when sending
534next versions. However if the patch has changed substantially in following
535version, these tags might not be applicable anymore and thus should be removed.
536Usually removal of someone's Tested-by or Reviewed-by tags should be mentioned
537in the patch changelog (after the '---' separator).
538
8543ae12
M
539A Suggested-by: tag indicates that the patch idea is suggested by the person
540named and ensures credit to the person for the idea. Please note that this
541tag should not be added without the reporter's permission, especially if the
542idea was not posted in a public forum. That said, if we diligently credit our
543idea reporters, they will, hopefully, be inspired to help us again in the
544future.
545
8401aa1f
JK
546A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
547is used to make it easy to determine where a bug originated, which can help
548review a bug fix. This tag also assists the stable kernel team in determining
549which stable kernel versions should receive your fix. This is the preferred
5903019b
MCC
550method for indicating a bug fixed by the patch. See :ref:`describe_changes`
551for more details.
8401aa1f 552
f58252cd 553.. _the_canonical_patch_format:
ef40203a 554
ef227c39
DD
555The canonical patch format
556--------------------------
7994cc15
JC
557
558This section describes how the patch itself should be formatted. Note
9b2c7677 559that, if you have your patches stored in a ``git`` repository, proper patch
5903019b 560formatting can be had with ``git format-patch``. The tools cannot create
7994cc15 561the necessary text, though, so read the instructions below anyway.
84da7c08 562
5903019b 563The canonical patch subject line is::
75f8426c 564
d6b9acc0 565 Subject: [PATCH 001/123] subsystem: summary phrase
75f8426c
PJ
566
567The canonical patch message body contains the following:
568
d19b3e32
JH
569 - A ``from`` line specifying the patch author, followed by an empty
570 line (only needed if the person sending the patch is not the author).
75f8426c 571
2a076f40
JP
572 - The body of the explanation, line wrapped at 75 columns, which will
573 be copied to the permanent changelog to describe this patch.
75f8426c 574
d19b3e32
JH
575 - An empty line.
576
5903019b 577 - The ``Signed-off-by:`` lines, described above, which will
75f8426c
PJ
578 also go in the changelog.
579
5903019b 580 - A marker line containing simply ``---``.
75f8426c
PJ
581
582 - Any additional comments not suitable for the changelog.
583
9b2c7677 584 - The actual patch (``diff`` output).
75f8426c
PJ
585
586The Subject line format makes it very easy to sort the emails
587alphabetically by subject line - pretty much any email reader will
588support that - since because the sequence number is zero-padded,
589the numerical and alphabetic sort is the same.
590
5903019b 591The ``subsystem`` in the email's Subject should identify which
d6b9acc0
PJ
592area or subsystem of the kernel is being patched.
593
5903019b
MCC
594The ``summary phrase`` in the email's Subject should concisely
595describe the patch which that email contains. The ``summary
596phrase`` should not be a filename. Do not use the same ``summary
597phrase`` for every patch in a whole patch series (where a ``patch
598series`` is an ordered sequence of multiple, related patches).
d6b9acc0 599
5903019b 600Bear in mind that the ``summary phrase`` of your email becomes a
2ae19aca 601globally-unique identifier for that patch. It propagates all the way
9b2c7677 602into the ``git`` changelog. The ``summary phrase`` may later be used in
2ae19aca 603developer discussions which refer to the patch. People will want to
5903019b 604google for the ``summary phrase`` to read discussion regarding that
2ae19aca
TT
605patch. It will also be the only thing that people may quickly see
606when, two or three months later, they are going through perhaps
9b2c7677
MCC
607thousands of patches using tools such as ``gitk`` or ``git log
608--oneline``.
2ae19aca 609
5903019b 610For these reasons, the ``summary`` must be no more than 70-75
2ae19aca
TT
611characters, and it must describe both what the patch changes, as well
612as why the patch might be necessary. It is challenging to be both
613succinct and descriptive, but that is what a well-written summary
614should do.
615
5903019b 616The ``summary phrase`` may be prefixed by tags enclosed in square
e12d7462
AH
617brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are
618not considered part of the summary phrase, but describe how the patch
2ae19aca
TT
619should be treated. Common tags might include a version descriptor if
620the multiple versions of the patch have been sent out in response to
621comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
622comments. If there are four patches in a patch series the individual
623patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
624that developers understand the order in which the patches should be
625applied and that they have reviewed or applied all of the patches in
626the patch series.
d6b9acc0 627
5903019b 628A couple of example Subjects::
d6b9acc0 629
e12d7462
AH
630 Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
631 Subject: [PATCH v2 01/27] x86: fix eflags tracking
75f8426c 632
5903019b 633The ``from`` line must be the very first line in the message body,
75f8426c
PJ
634and has the form:
635
24a2bb90 636 From: Patch Author <author@example.com>
75f8426c 637
5903019b
MCC
638The ``from`` line specifies who will be credited as the author of the
639patch in the permanent changelog. If the ``from`` line is missing,
640then the ``From:`` line from the email header will be used to determine
75f8426c
PJ
641the patch author in the changelog.
642
643The explanation body will be committed to the permanent source
644changelog, so should make sense to a competent reader who has long
645since forgotten the immediate details of the discussion that might
2ae19aca
TT
646have led to this patch. Including symptoms of the failure which the
647patch addresses (kernel log messages, oops messages, etc.) is
648especially useful for people who might be searching the commit logs
649looking for the applicable patch. If a patch fixes a compile failure,
650it may not be necessary to include _all_ of the compile failures; just
651enough that it is likely that someone searching for the patch can find
5903019b 652it. As in the ``summary phrase``, it is important to be both succinct as
2ae19aca 653well as descriptive.
75f8426c 654
5903019b 655The ``---`` marker line serves the essential purpose of marking for patch
75f8426c
PJ
656handling tools where the changelog message ends.
657
5903019b 658One good use for the additional comments after the ``---`` marker is for
9b2c7677
MCC
659a ``diffstat``, to show what files have changed, and the number of
660inserted and deleted lines per file. A ``diffstat`` is especially useful
2ae19aca
TT
661on bigger patches. Other comments relevant only to the moment or the
662maintainer, not suitable for the permanent changelog, should also go
5903019b 663here. A good example of such comments might be ``patch changelogs``
2ae19aca
TT
664which describe what has changed between the v1 and v2 version of the
665patch.
666
9b2c7677
MCC
667If you are going to include a ``diffstat`` after the ``---`` marker, please
668use ``diffstat`` options ``-p 1 -w 70`` so that filenames are listed from
2ae19aca 669the top of the kernel source tree and don't use too much horizontal
9b2c7677 670space (easily fit in 80 columns, maybe with some indentation). (``git``
8e3072a2 671generates appropriate diffstats by default.)
75f8426c
PJ
672
673See more details on the proper patch format in the following
674references.
675
5903019b
MCC
676.. _explicit_in_reply_to:
677
ef227c39
DD
678Explicit In-Reply-To headers
679----------------------------
d7ac8d85
CM
680
681It can be helpful to manually add In-Reply-To: headers to a patch
5903019b 682(e.g., when using ``git send-email``) to associate the patch with
d7ac8d85
CM
683previous relevant discussion, e.g. to link a bug fix to the email with
684the bug report. However, for a multi-patch series, it is generally
685best to avoid using In-Reply-To: to link to older versions of the
686series. This way multiple versions of the patch don't become an
687unmanageable forest of references in email clients. If a link is
688helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in
689the cover email text) to link to an earlier version of the patch series.
690
75f8426c 691
ef227c39
DD
692Providing base tree information
693-------------------------------
e8686a40
KR
694
695When other developers receive your patches and start the review process,
696it is often useful for them to know where in the tree history they
697should place your work. This is particularly useful for automated CI
698processes that attempt to run a series of tests in order to establish
699the quality of your submission before the maintainer starts the review.
700
701If you are using ``git format-patch`` to generate your patches, you can
702automatically include the base tree information in your submission by
703using the ``--base`` flag. The easiest and most convenient way to use
704this option is with topical branches::
705
706 $ git checkout -t -b my-topical-branch master
707 Branch 'my-topical-branch' set up to track local branch 'master'.
708 Switched to a new branch 'my-topical-branch'
709
710 [perform your edits and commits]
711
712 $ git format-patch --base=auto --cover-letter -o outgoing/ master
713 outgoing/0000-cover-letter.patch
714 outgoing/0001-First-Commit.patch
715 outgoing/...
716
717When you open ``outgoing/0000-cover-letter.patch`` for editing, you will
718notice that it will have the ``base-commit:`` trailer at the very
719bottom, which provides the reviewer and the CI tools enough information
720to properly perform ``git am`` without worrying about conflicts::
721
722 $ git checkout -b patch-review [base-commit-id]
723 Switched to a new branch 'patch-review'
724 $ git am patches.mbox
725 Applying: First Commit
726 Applying: ...
727
728Please see ``man git-format-patch`` for more information about this
729option.
730
731.. note::
732
733 The ``--base`` feature was introduced in git version 2.9.0.
734
735If you are not using git to format your patches, you can still include
736the same ``base-commit`` trailer to indicate the commit hash of the tree
737on which your work is based. You should add it either in the cover
738letter or in the first patch of the series and it should be placed
739either below the ``---`` line or at the very bottom of all other
740content, right before your email signature.
741
742
89edeedd
JC
743References
744----------
5b0ed2c6
XVP
745
746Andrew Morton, "The perfect patch" (tpp).
e7b4311e 747 <https://www.ozlabs.org/~akpm/stuff/tpp.txt>
5b0ed2c6 748
8e9cb8fd 749Jeff Garzik, "Linux kernel patch submission format".
5aff7c46 750 <https://web.archive.org/web/20180829112450/http://linux.yyz.us/patch-format.html>
5b0ed2c6 751
8e9cb8fd 752Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
f5039935 753 <http://www.kroah.com/log/linux/maintainer.html>
9b2c7677 754
f5039935 755 <http://www.kroah.com/log/linux/maintainer-02.html>
9b2c7677 756
f5039935 757 <http://www.kroah.com/log/linux/maintainer-03.html>
9b2c7677 758
f5039935 759 <http://www.kroah.com/log/linux/maintainer-04.html>
9b2c7677 760
f5039935 761 <http://www.kroah.com/log/linux/maintainer-05.html>
9b2c7677 762
7e0dae61 763 <http://www.kroah.com/log/linux/maintainer-06.html>
5b0ed2c6 764
bc7455fa 765NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
37c703f4 766 <https://lkml.org/lkml/2005/7/11/336>
5b0ed2c6 767
8c27ceff
MCC
768Kernel Documentation/process/coding-style.rst:
769 :ref:`Documentation/process/coding-style.rst <codingstyle>`
5b0ed2c6 770
8e9cb8fd 771Linus Torvalds's mail on the canonical patch format:
5b0ed2c6 772 <http://lkml.org/lkml/2005/4/7/183>
9536727e
AK
773
774Andi Kleen, "On submitting kernel patches"
25985edc 775 Some strategies to get difficult or controversial changes in.
9b2c7677 776
9536727e 777 http://halobates.de/on-submitting-patches.pdf