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