blob: e169c6ca52439669a2eaeef13a4909dbf77f06af [file] [log] [blame]
Linus Torvalds1da177e2005-04-16 15:20:36 -07001
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
Randy Dunlapbc7455f2006-07-30 03:03:45 -070013Read Documentation/SubmitChecklist for a list of items to check
14before submitting code. If you are submitting a driver, also read
15Documentation/SubmittingDrivers.
Linus Torvalds1da177e2005-04-16 15:20:36 -070016
Josh Triplett8e3072a2014-04-03 14:48:30 -070017Many 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -070021
22--------------------------------------------
23SECTION 1 - CREATING AND SENDING YOUR CHANGE
24--------------------------------------------
25
26
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700270) 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -070044
451) "diff -up"
46------------
47
Jonathan Corbet7994cc12014-12-23 08:43:41 -070048If 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -070051
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
Randy Dunlap84da7c02005-06-28 20:45:30 -070062 SRCTREE= linux-2.6
Linus Torvalds1da177e2005-04-16 15:20:36 -070063 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
Randy Dunlap84da7c02005-06-28 20:45:30 -070075 MYSRC= /devel/linux-2.6
Linus Torvalds1da177e2005-04-16 15:20:36 -070076
Randy Dunlap84da7c02005-06-28 20:45:30 -070077 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
Linus Torvalds1da177e2005-04-16 15:20:36 -070081
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
Randy Dunlap84da7c02005-06-28 20:45:30 -070084patch. The "dontdiff" file is included in the kernel tree in
Randy Dunlap755727b2013-03-08 12:43:35 -0800852.6.12 and later.
Linus Torvalds1da177e2005-04-16 15:20:36 -070086
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
Josh Triplett8e3072a2014-04-03 14:48:30 -070091If 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -070095
Josh Triplett8e3072a2014-04-03 14:48:30 -070096If 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.
Randy Dunlap84da7c02005-06-28 20:45:30 -070099
100
Linus Torvalds1da177e2005-04-16 15:20:36 -0700101
1022) Describe your changes.
103
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700104Describe 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700109
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700110Describe 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700132
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400133The 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
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700137Solve 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700140
Randy Dunlapd89b1942010-08-09 17:20:21 -0700141When 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
Josh Triplett74a475a2014-04-03 14:48:28 -0700150Describe 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
Randy Dunlapd89b1942010-08-09 17:20:21 -0700155If the patch fixes a logged bug entry, refer to that bug entry by
Josh Triplett9547c702014-04-03 14:48:29 -0700156number 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700165
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700166If 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
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700176You 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
Jacob Keller8401aa12014-06-06 14:36:39 -0700182If 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
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700184SHA-1 ID, and the one line summary. For example:
Jacob Keller8401aa12014-06-06 14:36:39 -0700185
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\")
Linus Torvalds1da177e2005-04-16 15:20:36 -0700195
1963) Separate your changes.
197
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800198Separate _logical changes_ into a single patch file.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700199
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
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700213When 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
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800219If 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
Linus Torvalds1da177e2005-04-16 15:20:36 -0700223
Jonathan Corbet6de16eb2014-12-23 08:38:24 -07002244) Style-check your changes.
225----------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700226
227Check your patch for basic style violations, details of which can be
228found in Documentation/CodingStyle. Failure to do so simply wastes
Linus Nilssonf56d35e2007-07-21 17:49:06 +0200229the reviewers time and will get your patch rejected, probably
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700230without even being read.
231
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700232One 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.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700238
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700239Check 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.
243
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.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700251
252
Jonathan Corbetccae8612014-12-23 08:49:18 -07002535) Select the recipients for your patch.
254----------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700255
Jonathan Corbetccae8612014-12-23 08:49:18 -0700256You should always copy the appropriate subsystem maintainer(s) on any patch
257to code that they maintain; look through the MAINTAINERS file and the
258source code revision history to see who those maintainers are. The
259script scripts/get_maintainer.pl can be very useful at this step. If you
260cannot find a maintainer for the subsystem your are working on, Andrew
261Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700262
Jonathan Corbetccae8612014-12-23 08:49:18 -0700263You should also normally choose at least one mailing list to receive a copy
264of your patch set. linux-kernel@vger.kernel.org functions as a list of
265last resort, but the volume on that list has caused a number of developers
266to tune it out. Look in the MAINTAINERS file for a subsystem-specific
267list; your patch will probably get more attention there. Please do not
268spam unrelated lists, though.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700269
Jonathan Corbetccae8612014-12-23 08:49:18 -0700270Many kernel-related lists are hosted on vger.kernel.org; you can find a
271list of them at http://vger.kernel.org/vger-lists.html. There are
272kernel-related lists hosted elsewhere as well, though.
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800273
274Do not send more than 15 patches at once to the vger mailing lists!!!
275
Linus Torvalds1da177e2005-04-16 15:20:36 -0700276Linus Torvalds is the final arbiter of all changes accepted into the
Linus Torvalds99ddcc72007-01-23 14:22:35 -0800277Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
Jonathan Corbetccae8612014-12-23 08:49:18 -0700278He gets a lot of e-mail, and, at this point, very few patches go through
279Linus directly, so typically you should do your best to -avoid-
280sending him e-mail.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700281
Jonathan Corbetccae8612014-12-23 08:49:18 -0700282If you have a patch that fixes an exploitable security bug, send that patch
283to security@kernel.org. For severe bugs, a short embargo may be considered
284to allow distrbutors to get the patch out to users; in such cases,
285obviously, the patch should not be sent to any public lists.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700286
Jonathan Corbetccae8612014-12-23 08:49:18 -0700287Patches that fix a severe bug in a released kernel should be directed
288toward the stable maintainers by putting a line like this:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700289
Jonathan Corbetccae8612014-12-23 08:49:18 -0700290 Cc: stable@vger.kernel.org
Linus Torvalds1da177e2005-04-16 15:20:36 -0700291
Jonathan Corbetccae8612014-12-23 08:49:18 -0700292into your patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700293
Jonathan Corbetccae8612014-12-23 08:49:18 -0700294Note, however, that some subsystem maintainers want to come to their own
295conclusions on which patches should go to the stable trees. The networking
296maintainer, in particular, would rather not see individual developers
297adding lines like the above to their patches.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700298
Jonathan Corbetccae8612014-12-23 08:49:18 -0700299If changes affect userland-kernel interfaces, please send the MAN-PAGES
300maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
301least a notification of the change, so that some information makes its way
302into the manual pages. User-space API changes should also be copied to
303linux-api@vger.kernel.org.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700304
305For small patches you may want to CC the Trivial Patch Monkey
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200306trivial@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:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700309 Spelling fixes in documentation
Jonathan Corbetccae8612014-12-23 08:49:18 -0700310 Spelling fixes for errors which could break grep(1)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700311 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)
Jonathan Corbetccae8612014-12-23 08:49:18 -0700314 Removing use of deprecated functions/macros
Linus Torvalds1da177e2005-04-16 15:20:36 -0700315 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)
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700318 Any fix by the author/maintainer of the file (ie. patch monkey
Linus Torvalds1da177e2005-04-16 15:20:36 -0700319 in re-transmission mode)
Randy Dunlap84da7c02005-06-28 20:45:30 -0700320
Linus Torvalds1da177e2005-04-16 15:20:36 -0700321
322
Jonathan Corbetccae8612014-12-23 08:49:18 -07003236) No MIME, no links, no compression, no attachments. Just plain text.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700324
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
Michael Opdenacker097091c2008-02-03 18:06:58 +0200343See Documentation/email-clients.txt for hints about configuring
344your e-mail client so that it sends your patches untouched.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700345
Jonathan Corbetccae8612014-12-23 08:49:18 -07003467) E-mail size.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700347
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700348When sending patches to Linus, always follow step #7.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700349
350Large changes are not appropriate for mailing lists, and some
Randy Dunlap4932be72009-10-01 15:44:06 -0700351maintainers. If your patch, uncompressed, exceeds 300 kB in size,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700352it 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
Jonathan Corbetccae8612014-12-23 08:49:18 -07003578) Name your kernel version.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700358
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
Jonathan Corbetccae8612014-12-23 08:49:18 -07003679) Don't get discouraged. Re-submit.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700368
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
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700381* Your patch did not apply cleanly to the latest kernel version.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700382* Your patch was not sufficiently discussed on linux-kernel.
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700383* 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.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700388
389When in doubt, solicit comments on linux-kernel mailing list.
390
391
392
Jonathan Corbetccae8612014-12-23 08:49:18 -070039310) Include PATCH in the subject
Linus Torvalds1da177e2005-04-16 15:20:36 -0700394
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
Jonathan Corbetccae8612014-12-23 08:49:18 -070040211) Sign your work
Linus Torvalds1da177e2005-04-16 15:20:36 -0700403
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
Zac Storerdb12fb82011-08-13 12:34:45 -0700411pass it on as an open-source patch. The rules are pretty simple: if you
Linus Torvalds1da177e2005-04-16 15:20:36 -0700412can certify the below:
413
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700414 Developer's Certificate of Origin 1.1
Linus Torvalds1da177e2005-04-16 15:20:36 -0700415
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
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700434 (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
Linus Torvalds1da177e2005-04-16 15:20:36 -0700440then you just add a line saying
441
Alexey Dobriyan9fd55592005-06-25 14:59:34 -0700442 Signed-off-by: Random J Developer <random@developer.example.org>
Linus Torvalds1da177e2005-04-16 15:20:36 -0700443
Greg KHaf45f322006-09-12 20:35:52 -0700444using your real name (sorry, no pseudonyms or anonymous contributions.)
445
Linus Torvalds1da177e2005-04-16 15:20:36 -0700446Some 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
Willy Tarreauadbd5882008-06-03 00:20:28 +0200450If 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
Jeremiah Mahler305af082014-05-22 00:04:26 -0700467This practice is particularly helpful if you maintain a stable branch and
Willy Tarreauadbd5882008-06-03 00:20:28 +0200468want 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
Jeremiah Mahler305af082014-05-22 00:04:26 -0700473Special note to back-porters: It seems to be a common and useful practice
Willy Tarreauadbd5882008-06-03 00:20:28 +0200474to 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,
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700476here's what we see in a 3.x-stable release:
Willy Tarreauadbd5882008-06-03 00:20:28 +0200477
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700478Date: Tue Oct 7 07:26:38 2014 -0400
Willy Tarreauadbd5882008-06-03 00:20:28 +0200479
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700480 libata: Un-break ATA blacklist
Willy Tarreauadbd5882008-06-03 00:20:28 +0200481
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700482 commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
Willy Tarreauadbd5882008-06-03 00:20:28 +0200483
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700484And here's what might appear in an older kernel once a patch is backported:
Willy Tarreauadbd5882008-06-03 00:20:28 +0200485
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
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700493tracking your trees, and to people trying to troubleshoot bugs in your
Willy Tarreauadbd5882008-06-03 00:20:28 +0200494tree.
495
Linus Torvalds1da177e2005-04-16 15:20:36 -0700496
Jonathan Corbetccae8612014-12-23 08:49:18 -070049712) When to use Acked-by: and Cc:
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700498
Andrew Morton0f44cd22007-06-08 13:46:45 -0700499The 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.
Jonathan Corbetef402032008-03-28 11:22:38 -0600518When in doubt people should refer to the original discussion in the mailing
Andrew Morton0f44cd22007-06-08 13:46:45 -0700519list archives.
520
Jonathan Corbetef402032008-03-28 11:22:38 -0600521If 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
Andrew Morton0f44cd22007-06-08 13:46:45 -0700526
Jonathan Corbetef402032008-03-28 11:22:38 -0600527
Jonathan Corbetccae8612014-12-23 08:49:18 -070052813) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
Jonathan Corbetbbb0a4242009-01-16 09:49:50 -0700529
Dan Carpenterd75ef702014-10-29 13:01:36 +0300530The 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.
Jonathan Corbetef402032008-03-28 11:22:38 -0600534
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
Pavel Machek5801da12009-06-04 16:26:50 +0200572increase the likelihood of your patch getting into the kernel.
Jonathan Corbetef402032008-03-28 11:22:38 -0600573
Mugunthan V N8543ae12013-04-29 16:18:17 -0700574A 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
Jacob Keller8401aa12014-06-06 14:36:39 -0700581A 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
Jonathan Corbetef402032008-03-28 11:22:38 -0600587
Jonathan Corbetccae8612014-12-23 08:49:18 -070058814) The canonical patch format
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700589------------------------------
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.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700595
Paul Jackson75f84262005-10-02 18:01:42 -0700596The canonical patch subject line is:
597
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700598 Subject: [PATCH 001/123] subsystem: summary phrase
Paul Jackson75f84262005-10-02 18:01:42 -0700599
600The canonical patch message body contains the following:
601
Jonathan Corbetccae8612014-12-23 08:49:18 -0700602 - A "from" line specifying the patch author (only needed if the person
603 sending the patch is not the author).
Paul Jackson75f84262005-10-02 18:01:42 -0700604
605 - An empty line.
606
607 - The body of the explanation, which will be copied to the
608 permanent changelog to describe this patch.
609
610 - The "Signed-off-by:" lines, described above, which will
611 also go in the changelog.
612
613 - A marker line containing simply "---".
614
615 - Any additional comments not suitable for the changelog.
616
617 - The actual patch (diff output).
618
619The Subject line format makes it very easy to sort the emails
620alphabetically by subject line - pretty much any email reader will
621support that - since because the sequence number is zero-padded,
622the numerical and alphabetic sort is the same.
623
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700624The "subsystem" in the email's Subject should identify which
625area or subsystem of the kernel is being patched.
626
627The "summary phrase" in the email's Subject should concisely
628describe the patch which that email contains. The "summary
629phrase" should not be a filename. Do not use the same "summary
Randy Dunlap66effdc2007-05-09 02:33:42 -0700630phrase" for every patch in a whole patch series (where a "patch
631series" is an ordered sequence of multiple, related patches).
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700632
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400633Bear in mind that the "summary phrase" of your email becomes a
634globally-unique identifier for that patch. It propagates all the way
635into the git changelog. The "summary phrase" may later be used in
636developer discussions which refer to the patch. People will want to
637google for the "summary phrase" to read discussion regarding that
638patch. It will also be the only thing that people may quickly see
639when, two or three months later, they are going through perhaps
640thousands of patches using tools such as "gitk" or "git log
641--oneline".
642
643For these reasons, the "summary" must be no more than 70-75
644characters, and it must describe both what the patch changes, as well
645as why the patch might be necessary. It is challenging to be both
646succinct and descriptive, but that is what a well-written summary
647should do.
648
649The "summary phrase" may be prefixed by tags enclosed in square
650brackets: "Subject: [PATCH tag] <summary phrase>". The tags are not
651considered part of the summary phrase, but describe how the patch
652should be treated. Common tags might include a version descriptor if
653the multiple versions of the patch have been sent out in response to
654comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
655comments. If there are four patches in a patch series the individual
656patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
657that developers understand the order in which the patches should be
658applied and that they have reviewed or applied all of the patches in
659the patch series.
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700660
661A couple of example Subjects:
662
663 Subject: [patch 2/5] ext2: improve scalability of bitmap searching
664 Subject: [PATCHv2 001/207] x86: fix eflags tracking
Paul Jackson75f84262005-10-02 18:01:42 -0700665
666The "from" line must be the very first line in the message body,
667and has the form:
668
669 From: Original Author <author@example.com>
670
671The "from" line specifies who will be credited as the author of the
672patch in the permanent changelog. If the "from" line is missing,
673then the "From:" line from the email header will be used to determine
674the patch author in the changelog.
675
676The explanation body will be committed to the permanent source
677changelog, so should make sense to a competent reader who has long
678since forgotten the immediate details of the discussion that might
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400679have led to this patch. Including symptoms of the failure which the
680patch addresses (kernel log messages, oops messages, etc.) is
681especially useful for people who might be searching the commit logs
682looking for the applicable patch. If a patch fixes a compile failure,
683it may not be necessary to include _all_ of the compile failures; just
684enough that it is likely that someone searching for the patch can find
685it. As in the "summary phrase", it is important to be both succinct as
686well as descriptive.
Paul Jackson75f84262005-10-02 18:01:42 -0700687
688The "---" marker line serves the essential purpose of marking for patch
689handling tools where the changelog message ends.
690
691One good use for the additional comments after the "---" marker is for
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400692a diffstat, to show what files have changed, and the number of
693inserted and deleted lines per file. A diffstat is especially useful
694on bigger patches. Other comments relevant only to the moment or the
695maintainer, not suitable for the permanent changelog, should also go
696here. A good example of such comments might be "patch changelogs"
697which describe what has changed between the v1 and v2 version of the
698patch.
699
700If you are going to include a diffstat after the "---" marker, please
701use diffstat options "-p 1 -w 70" so that filenames are listed from
702the top of the kernel source tree and don't use too much horizontal
Josh Triplett8e3072a2014-04-03 14:48:30 -0700703space (easily fit in 80 columns, maybe with some indentation). (git
704generates appropriate diffstats by default.)
Paul Jackson75f84262005-10-02 18:01:42 -0700705
706See more details on the proper patch format in the following
707references.
708
709
Jonathan Corbetccae8612014-12-23 08:49:18 -070071015) Sending "git pull" requests
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700711-------------------------------
Randy Dunlap84da7c02005-06-28 20:45:30 -0700712
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700713If you have a series of patches, it may be most convenient to have the
714maintainer pull them directly into the subsystem repository with a
715"git pull" operation. Note, however, that pulling patches from a developer
716requires a higher degree of trust than taking patches from a mailing list.
717As a result, many subsystem maintainers are reluctant to take pull
718requests, especially from new, unknown developers.
Randy Dunlap14863612008-07-27 20:44:24 -0700719
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700720A pull request should have [GIT] or [PULL] in the subject line. The
721request itself should include the repository name and the branch of
722interest on a single line; it should look something like:
Randy Dunlap14863612008-07-27 20:44:24 -0700723
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700724 Please pull from
Randy Dunlap14863612008-07-27 20:44:24 -0700725
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700726 git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
Randy Dunlap14863612008-07-27 20:44:24 -0700727
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700728 to get these changes:"
Randy Dunlap14863612008-07-27 20:44:24 -0700729
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700730A pull request should also include an overall message saying what will be
731included in the request, a "git shortlog" listing of the patches
732themselves, and a diffstat showing the overall effect of the patch series.
733The easiest way to get all this information together is, of course, to let
734git do it for you with the "git request-pull" command.
Randy Dunlap14863612008-07-27 20:44:24 -0700735
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700736Some maintainers (including Linus) want to see pull requests from signed
737commits; that increases their confidence that the request actually came
738from you. Linus, in particular, will not pull from public hosting sites
739like GitHub in the absence of a signed tag.
Randy Dunlap14863612008-07-27 20:44:24 -0700740
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700741The first step toward creating such tags is to make a GNUPG key and get it
742signed by one or more core kernel developers. This step can be hard for
743new developers, but there is no way around it. Attending conferences can
744be a good way to find developers who can sign your key.
Randy Dunlap14863612008-07-27 20:44:24 -0700745
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700746Once you have prepared a patch series in git that you wish to have somebody
747pull, create a signed tag with "git tag -s". This will create a new tag
748identifying the last commit in the series and containing a signature
749created with your private key. You will also have the opportunity to add a
750changelog-style message to the tag; this is an ideal place to describe the
751effects of the pull request as a whole.
752
753If the tree the maintainer will be pulling from is not the repository you
754are working from, don't forget to push the signed tag explicitly to the
755public tree.
756
757When generating your pull request, use the signed tag as the target. A
758command like this will do the trick:
759
760 git request-pull master git://my.public.tree/linux.git my-signed-tag
Randy Dunlap84da7c02005-06-28 20:45:30 -0700761
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800762
763----------------------
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700764SECTION 2 - REFERENCES
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800765----------------------
766
767Andrew Morton, "The perfect patch" (tpp).
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700768 <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800769
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700770Jeff Garzik, "Linux kernel patch submission format".
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800771 <http://linux.yyz.us/patch-format.html>
772
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700773Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
Vikram Narayananf5039932011-05-23 12:01:25 -0700774 <http://www.kroah.com/log/linux/maintainer.html>
775 <http://www.kroah.com/log/linux/maintainer-02.html>
776 <http://www.kroah.com/log/linux/maintainer-03.html>
777 <http://www.kroah.com/log/linux/maintainer-04.html>
778 <http://www.kroah.com/log/linux/maintainer-05.html>
Sudip Mukherjee7e0dae62014-09-07 11:26:12 -0700779 <http://www.kroah.com/log/linux/maintainer-06.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800780
Randy Dunlapbc7455f2006-07-30 03:03:45 -0700781NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700782 <https://lkml.org/lkml/2005/7/11/336>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800783
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700784Kernel Documentation/CodingStyle:
Qi Yong4db29c12007-06-12 13:06:49 +0800785 <http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800786
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700787Linus Torvalds's mail on the canonical patch format:
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800788 <http://lkml.org/lkml/2005/4/7/183>
Andi Kleen95367272008-10-15 22:02:02 -0700789
790Andi Kleen, "On submitting kernel patches"
Lucas De Marchi25985ed2011-03-30 22:57:33 -0300791 Some strategies to get difficult or controversial changes in.
Andi Kleen95367272008-10-15 22:02:02 -0700792 http://halobates.de/on-submitting-patches.pdf
793
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800794--