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