blob: e6cbe59d890fa54a864841205e60ea52f3d3a092 [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
Jonathan Corbetd00c4552014-12-23 08:54:36 -070013This document contains a large number of suggestions in a relatively terse
14format. For detailed information on how the kernel development process
15works, see Documentation/development-process. Also, read
16Documentation/SubmitChecklist for a list of items to check before
17submitting code. If you are submitting a driver, also read
Randy Dunlapbc7455f2006-07-30 03:03:45 -070018Documentation/SubmittingDrivers.
Linus Torvalds1da177e2005-04-16 15:20:36 -070019
Josh Triplett8e3072a2014-04-03 14:48:30 -070020Many of these steps describe the default behavior of the git version
21control system; if you use git to prepare your patches, you'll find much
22of the mechanical work done for you, though you'll still need to prepare
Jonathan Corbetd00c4552014-12-23 08:54:36 -070023and document a sensible set of patches. In general, use of git will make
24your life as a kernel developer easier.
Linus Torvalds1da177e2005-04-16 15:20:36 -070025
26--------------------------------------------
27SECTION 1 - CREATING AND SENDING YOUR CHANGE
28--------------------------------------------
29
30
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700310) Obtain a current source tree
32-------------------------------
33
34If you do not have a repository with the current kernel source handy, use
35git to obtain one. You'll want to start with the mainline repository,
36which can be grabbed with:
37
38 git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
39
40Note, however, that you may not want to develop against the mainline tree
41directly. Most subsystem maintainers run their own trees and want to see
42patches prepared against those trees. See the "T:" entry for the subsystem
43in the MAINTAINERS file to find that tree, or simply ask the maintainer if
44the tree is not listed there.
45
46It is still possible to download kernel releases via tarballs (as described
47in the next section), but that is the hard way to do kernel development.
Linus Torvalds1da177e2005-04-16 15:20:36 -070048
491) "diff -up"
50------------
51
Jonathan Corbet7994cc12014-12-23 08:43:41 -070052If you must generate your patches by hand, use "diff -up" or "diff -uprN"
53to create patches. Git generates patches in this form by default; if
54you're using git, you can skip this section entirely.
Linus Torvalds1da177e2005-04-16 15:20:36 -070055
56All changes to the Linux kernel occur in the form of patches, as
57generated by diff(1). When creating your patch, make sure to create it
58in "unified diff" format, as supplied by the '-u' argument to diff(1).
59Also, please use the '-p' argument which shows which C function each
60change is in - that makes the resultant diff a lot easier to read.
61Patches should be based in the root kernel source directory,
62not in any lower subdirectory.
63
64To create a patch for a single file, it is often sufficient to do:
65
Jonathan Corbetd00c4552014-12-23 08:54:36 -070066 SRCTREE= linux
Linus Torvalds1da177e2005-04-16 15:20:36 -070067 MYFILE= drivers/net/mydriver.c
68
69 cd $SRCTREE
70 cp $MYFILE $MYFILE.orig
71 vi $MYFILE # make your change
72 cd ..
73 diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch
74
75To create a patch for multiple files, you should unpack a "vanilla",
76or unmodified kernel source tree, and generate a diff against your
77own source tree. For example:
78
Jonathan Corbetd00c4552014-12-23 08:54:36 -070079 MYSRC= /devel/linux
Linus Torvalds1da177e2005-04-16 15:20:36 -070080
Jonathan Corbetd00c4552014-12-23 08:54:36 -070081 tar xvfz linux-3.19.tar.gz
82 mv linux-3.19 linux-3.19-vanilla
83 diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \
84 linux-3.19-vanilla $MYSRC > /tmp/patch
Linus Torvalds1da177e2005-04-16 15:20:36 -070085
86"dontdiff" is a list of files which are generated by the kernel during
87the build process, and should be ignored in any diff(1)-generated
Jonathan Corbetd00c4552014-12-23 08:54:36 -070088patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -070089
90Make sure your patch does not include any extra files which do not
91belong in a patch submission. Make sure to review your patch -after-
92generated it with diff(1), to ensure accuracy.
93
Josh Triplett8e3072a2014-04-03 14:48:30 -070094If your changes produce a lot of deltas, you need to split them into
95individual patches which modify things in logical stages; see section
96#3. This will facilitate easier reviewing by other kernel developers,
97very important if you want your patch accepted.
Linus Torvalds1da177e2005-04-16 15:20:36 -070098
Josh Triplett8e3072a2014-04-03 14:48:30 -070099If you're using git, "git rebase -i" can help you with this process. If
100you're not using git, quilt <http://savannah.nongnu.org/projects/quilt>
101is another popular alternative.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700102
103
Linus Torvalds1da177e2005-04-16 15:20:36 -0700104
1052) Describe your changes.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700106-------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700107
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700108Describe your problem. Whether your patch is a one-line bug fix or
1095000 lines of a new feature, there must be an underlying problem that
110motivated you to do this work. Convince the reviewer that there is a
111problem worth fixing and that it makes sense for them to read past the
112first paragraph.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700113
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700114Describe user-visible impact. Straight up crashes and lockups are
115pretty convincing, but not all bugs are that blatant. Even if the
116problem was spotted during code review, describe the impact you think
117it can have on users. Keep in mind that the majority of Linux
118installations run kernels from secondary stable trees or
119vendor/product-specific trees that cherry-pick only specific patches
120from upstream, so include anything that could help route your change
121downstream: provoking circumstances, excerpts from dmesg, crash
122descriptions, performance regressions, latency spikes, lockups, etc.
123
124Quantify optimizations and trade-offs. If you claim improvements in
125performance, memory consumption, stack footprint, or binary size,
126include numbers that back them up. But also describe non-obvious
127costs. Optimizations usually aren't free but trade-offs between CPU,
128memory, and readability; or, when it comes to heuristics, between
129different workloads. Describe the expected downsides of your
130optimization so that the reviewer can weigh costs against benefits.
131
132Once the problem is established, describe what you are actually doing
133about it in technical detail. It's important to describe the change
134in plain English for the reviewer to verify that the code is behaving
135as you intend it to.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700136
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400137The maintainer will thank you if you write your patch description in a
138form which can be easily pulled into Linux's source code management
139system, git, as a "commit log". See #15, below.
140
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700141Solve only one problem per patch. If your description starts to get
142long, that's a sign that you probably need to split up your patch.
143See #3, next.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700144
Randy Dunlapd89b1942010-08-09 17:20:21 -0700145When you submit or resubmit a patch or patch series, include the
146complete patch description and justification for it. Don't just
147say that this is version N of the patch (series). Don't expect the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700148subsystem maintainer to refer back to earlier patch versions or referenced
Randy Dunlapd89b1942010-08-09 17:20:21 -0700149URLs to find the patch description and put that into the patch.
150I.e., the patch (series) and its description should be self-contained.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700151This benefits both the maintainers and reviewers. Some reviewers
Randy Dunlapd89b1942010-08-09 17:20:21 -0700152probably didn't even receive earlier versions of the patch.
153
Josh Triplett74a475a2014-04-03 14:48:28 -0700154Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
155instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
156to do frotz", as if you are giving orders to the codebase to change
157its behaviour.
158
Randy Dunlapd89b1942010-08-09 17:20:21 -0700159If the patch fixes a logged bug entry, refer to that bug entry by
Josh Triplett9547c702014-04-03 14:48:29 -0700160number and URL. If the patch follows from a mailing list discussion,
161give a URL to the mailing list archive; use the https://lkml.kernel.org/
162redirector with a Message-Id, to ensure that the links cannot become
163stale.
164
165However, try to make your explanation understandable without external
166resources. In addition to giving a URL to a mailing list archive or
167bug, summarize the relevant points of the discussion that led to the
168patch as submitted.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700169
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700170If you want to refer to a specific commit, don't just refer to the
171SHA-1 ID of the commit. Please also include the oneline summary of
172the commit, to make it easier for reviewers to know what it is about.
173Example:
174
175 Commit e21d2170f36602ae2708 ("video: remove unnecessary
176 platform_set_drvdata()") removed the unnecessary
177 platform_set_drvdata(), but left the variable "dev" unused,
178 delete it.
179
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700180You should also be sure to use at least the first twelve characters of the
181SHA-1 ID. The kernel repository holds a *lot* of objects, making
182collisions with shorter IDs a real possibility. Bear in mind that, even if
183there is no collision with your six-character ID now, that condition may
184change five years from now.
185
Jacob Keller8401aa12014-06-06 14:36:39 -0700186If your patch fixes a bug in a specific commit, e.g. you found an issue using
187git-bisect, please use the 'Fixes:' tag with the first 12 characters of the
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700188SHA-1 ID, and the one line summary. For example:
Jacob Keller8401aa12014-06-06 14:36:39 -0700189
190 Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")
191
192The following git-config settings can be used to add a pretty format for
193outputting the above style in the git log or git show commands
194
195 [core]
196 abbrev = 12
197 [pretty]
198 fixes = Fixes: %h (\"%s\")
Linus Torvalds1da177e2005-04-16 15:20:36 -0700199
2003) Separate your changes.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700201-------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700202
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700203Separate each _logical change_ into a separate patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700204
205For example, if your changes include both bug fixes and performance
206enhancements for a single driver, separate those changes into two
207or more patches. If your changes include an API update, and a new
208driver which uses that new API, separate those into two patches.
209
210On the other hand, if you make a single change to numerous files,
211group those changes into a single patch. Thus a single logical change
212is contained within a single patch.
213
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700214The point to remember is that each patch should make an easily understood
215change that can be verified by reviewers. Each patch should be justifiable
216on its own merits.
217
Linus Torvalds1da177e2005-04-16 15:20:36 -0700218If one patch depends on another patch in order for a change to be
219complete, that is OK. Simply note "this patch depends on patch X"
220in your patch description.
221
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700222When dividing your change into a series of patches, take special care to
223ensure that the kernel builds and runs properly after each patch in the
224series. Developers using "git bisect" to track down a problem can end up
225splitting your patch series at any point; they will not thank you if you
226introduce bugs in the middle.
227
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800228If you cannot condense your patch set into a smaller set of patches,
229then only post say 15 or so at a time and wait for review and integration.
230
231
Linus Torvalds1da177e2005-04-16 15:20:36 -0700232
Jonathan Corbet6de16eb2014-12-23 08:38:24 -07002334) Style-check your changes.
234----------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700235
236Check your patch for basic style violations, details of which can be
237found in Documentation/CodingStyle. Failure to do so simply wastes
Linus Nilssonf56d35e2007-07-21 17:49:06 +0200238the reviewers time and will get your patch rejected, probably
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700239without even being read.
240
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700241One significant exception is when moving code from one file to
242another -- in this case you should not modify the moved code at all in
243the same patch which moves it. This clearly delineates the act of
244moving the code and your changes. This greatly aids review of the
245actual differences and allows tools to better track the history of
246the code itself.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700247
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700248Check your patches with the patch style checker prior to submission
249(scripts/checkpatch.pl). Note, though, that the style checker should be
250viewed as a guide, not as a replacement for human judgment. If your code
251looks better with a violation then its probably best left alone.
252
253The checker reports at three levels:
254 - ERROR: things that are very likely to be wrong
255 - WARNING: things requiring careful review
256 - CHECK: things requiring thought
257
258You should be able to justify all violations that remain in your
259patch.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700260
261
Jonathan Corbetccae8612014-12-23 08:49:18 -07002625) Select the recipients for your patch.
263----------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700264
Jonathan Corbetccae8612014-12-23 08:49:18 -0700265You should always copy the appropriate subsystem maintainer(s) on any patch
266to code that they maintain; look through the MAINTAINERS file and the
267source code revision history to see who those maintainers are. The
268script scripts/get_maintainer.pl can be very useful at this step. If you
269cannot find a maintainer for the subsystem your are working on, Andrew
270Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700271
Jonathan Corbetccae8612014-12-23 08:49:18 -0700272You should also normally choose at least one mailing list to receive a copy
273of your patch set. linux-kernel@vger.kernel.org functions as a list of
274last resort, but the volume on that list has caused a number of developers
275to tune it out. Look in the MAINTAINERS file for a subsystem-specific
276list; your patch will probably get more attention there. Please do not
277spam unrelated lists, though.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700278
Jonathan Corbetccae8612014-12-23 08:49:18 -0700279Many kernel-related lists are hosted on vger.kernel.org; you can find a
280list of them at http://vger.kernel.org/vger-lists.html. There are
281kernel-related lists hosted elsewhere as well, though.
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800282
283Do not send more than 15 patches at once to the vger mailing lists!!!
284
Linus Torvalds1da177e2005-04-16 15:20:36 -0700285Linus Torvalds is the final arbiter of all changes accepted into the
Linus Torvalds99ddcc72007-01-23 14:22:35 -0800286Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
Jonathan Corbetccae8612014-12-23 08:49:18 -0700287He gets a lot of e-mail, and, at this point, very few patches go through
288Linus directly, so typically you should do your best to -avoid-
289sending him e-mail.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700290
Jonathan Corbetccae8612014-12-23 08:49:18 -0700291If you have a patch that fixes an exploitable security bug, send that patch
292to security@kernel.org. For severe bugs, a short embargo may be considered
293to allow distrbutors to get the patch out to users; in such cases,
294obviously, the patch should not be sent to any public lists.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700295
Jonathan Corbetccae8612014-12-23 08:49:18 -0700296Patches that fix a severe bug in a released kernel should be directed
297toward the stable maintainers by putting a line like this:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700298
Jonathan Corbetccae8612014-12-23 08:49:18 -0700299 Cc: stable@vger.kernel.org
Linus Torvalds1da177e2005-04-16 15:20:36 -0700300
Jonathan Corbetccae8612014-12-23 08:49:18 -0700301into your patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700302
Jonathan Corbetccae8612014-12-23 08:49:18 -0700303Note, however, that some subsystem maintainers want to come to their own
304conclusions on which patches should go to the stable trees. The networking
305maintainer, in particular, would rather not see individual developers
306adding lines like the above to their patches.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700307
Jonathan Corbetccae8612014-12-23 08:49:18 -0700308If changes affect userland-kernel interfaces, please send the MAN-PAGES
309maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
310least a notification of the change, so that some information makes its way
311into the manual pages. User-space API changes should also be copied to
312linux-api@vger.kernel.org.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700313
314For small patches you may want to CC the Trivial Patch Monkey
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200315trivial@kernel.org which collects "trivial" patches. Have a look
316into the MAINTAINERS file for its current manager.
317Trivial patches must qualify for one of the following rules:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700318 Spelling fixes in documentation
Jonathan Corbetccae8612014-12-23 08:49:18 -0700319 Spelling fixes for errors which could break grep(1)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700320 Warning fixes (cluttering with useless warnings is bad)
321 Compilation fixes (only if they are actually correct)
322 Runtime fixes (only if they actually fix things)
Jonathan Corbetccae8612014-12-23 08:49:18 -0700323 Removing use of deprecated functions/macros
Linus Torvalds1da177e2005-04-16 15:20:36 -0700324 Contact detail and documentation fixes
325 Non-portable code replaced by portable code (even in arch-specific,
326 since people copy, as long as it's trivial)
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700327 Any fix by the author/maintainer of the file (ie. patch monkey
Linus Torvalds1da177e2005-04-16 15:20:36 -0700328 in re-transmission mode)
Randy Dunlap84da7c02005-06-28 20:45:30 -0700329
Linus Torvalds1da177e2005-04-16 15:20:36 -0700330
331
Jonathan Corbetccae8612014-12-23 08:49:18 -07003326) No MIME, no links, no compression, no attachments. Just plain text.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700333-----------------------------------------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700334
335Linus and other kernel developers need to be able to read and comment
336on the changes you are submitting. It is important for a kernel
337developer to be able to "quote" your changes, using standard e-mail
338tools, so that they may comment on specific portions of your code.
339
340For this reason, all patches should be submitting e-mail "inline".
341WARNING: Be wary of your editor's word-wrap corrupting your patch,
342if you choose to cut-n-paste your patch.
343
344Do not attach the patch as a MIME attachment, compressed or not.
345Many popular e-mail applications will not always transmit a MIME
346attachment as plain text, making it impossible to comment on your
347code. A MIME attachment also takes Linus a bit more time to process,
348decreasing the likelihood of your MIME-attached change being accepted.
349
350Exception: If your mailer is mangling patches then someone may ask
351you to re-send them using MIME.
352
Michael Opdenacker097091c2008-02-03 18:06:58 +0200353See Documentation/email-clients.txt for hints about configuring
354your e-mail client so that it sends your patches untouched.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700355
Jonathan Corbetccae8612014-12-23 08:49:18 -07003567) E-mail size.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700357---------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700358
359Large changes are not appropriate for mailing lists, and some
Randy Dunlap4932be72009-10-01 15:44:06 -0700360maintainers. If your patch, uncompressed, exceeds 300 kB in size,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700361it is preferred that you store your patch on an Internet-accessible
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700362server, and provide instead a URL (link) pointing to your patch. But note
363that if your patch exceeds 300 kB, it almost certainly needs to be broken up
364anyway.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700365
Jonathan Corbet0eea2312014-12-23 08:52:01 -07003668) Respond to review comments.
367------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700368
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700369Your patch will almost certainly get comments from reviewers on ways in
370which the patch can be improved. You must respond to those comments;
371ignoring reviewers is a good way to get ignored in return. Review comments
372or questions that do not lead to a code change should almost certainly
373bring about a comment or changelog entry so that the next reviewer better
374understands what is going on.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700375
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700376Be sure to tell the reviewers what changes you are making and to thank them
377for their time. Code review is a tiring and time-consuming process, and
378reviewers sometimes get grumpy. Even in that case, though, respond
379politely and address the problems they have pointed out.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700380
381
Jonathan Corbet0eea2312014-12-23 08:52:01 -07003829) Don't get discouraged - or impatient.
383----------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700384
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700385After you have submitted your change, be patient and wait. Reviewers are
386busy people and may not get to your patch right away.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700387
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700388Once upon a time, patches used to disappear into the void without comment,
389but the development process works more smoothly than that now. You should
390receive comments within a week or so; if that does not happen, make sure
391that you have sent your patches to the right place. Wait for a minimum of
392one week before resubmitting or pinging reviewers - possibly longer during
393busy times like merge windows.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700394
395
Jonathan Corbetccae8612014-12-23 08:49:18 -070039610) Include PATCH in the subject
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700397--------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700398
399Due to high e-mail traffic to Linus, and to linux-kernel, it is common
400convention to prefix your subject line with [PATCH]. This lets Linus
401and other kernel developers more easily distinguish patches from other
402e-mail discussions.
403
404
405
Jonathan Corbetccae8612014-12-23 08:49:18 -070040611) Sign your work
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700407------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700408
409To improve tracking of who did what, especially with patches that can
410percolate to their final resting place in the kernel through several
411layers of maintainers, we've introduced a "sign-off" procedure on
412patches that are being emailed around.
413
414The sign-off is a simple line at the end of the explanation for the
415patch, which certifies that you wrote it or otherwise have the right to
Zac Storerdb12fb82011-08-13 12:34:45 -0700416pass it on as an open-source patch. The rules are pretty simple: if you
Linus Torvalds1da177e2005-04-16 15:20:36 -0700417can certify the below:
418
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700419 Developer's Certificate of Origin 1.1
Linus Torvalds1da177e2005-04-16 15:20:36 -0700420
421 By making a contribution to this project, I certify that:
422
423 (a) The contribution was created in whole or in part by me and I
424 have the right to submit it under the open source license
425 indicated in the file; or
426
427 (b) The contribution is based upon previous work that, to the best
428 of my knowledge, is covered under an appropriate open source
429 license and I have the right under that license to submit that
430 work with modifications, whether created in whole or in part
431 by me, under the same open source license (unless I am
432 permitted to submit under a different license), as indicated
433 in the file; or
434
435 (c) The contribution was provided directly to me by some other
436 person who certified (a), (b) or (c) and I have not modified
437 it.
438
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700439 (d) I understand and agree that this project and the contribution
440 are public and that a record of the contribution (including all
441 personal information I submit with it, including my sign-off) is
442 maintained indefinitely and may be redistributed consistent with
443 this project or the open source license(s) involved.
444
Linus Torvalds1da177e2005-04-16 15:20:36 -0700445then you just add a line saying
446
Alexey Dobriyan9fd55592005-06-25 14:59:34 -0700447 Signed-off-by: Random J Developer <random@developer.example.org>
Linus Torvalds1da177e2005-04-16 15:20:36 -0700448
Greg KHaf45f322006-09-12 20:35:52 -0700449using your real name (sorry, no pseudonyms or anonymous contributions.)
450
Linus Torvalds1da177e2005-04-16 15:20:36 -0700451Some people also put extra tags at the end. They'll just be ignored for
452now, but you can do this to mark internal company procedures or just
453point out some special detail about the sign-off.
454
Willy Tarreauadbd5882008-06-03 00:20:28 +0200455If you are a subsystem or branch maintainer, sometimes you need to slightly
456modify patches you receive in order to merge them, because the code is not
457exactly the same in your tree and the submitters'. If you stick strictly to
458rule (c), you should ask the submitter to rediff, but this is a totally
459counter-productive waste of time and energy. Rule (b) allows you to adjust
460the code, but then it is very impolite to change one submitter's code and
461make him endorse your bugs. To solve this problem, it is recommended that
462you add a line between the last Signed-off-by header and yours, indicating
463the nature of your changes. While there is nothing mandatory about this, it
464seems like prepending the description with your mail and/or name, all
465enclosed in square brackets, is noticeable enough to make it obvious that
466you are responsible for last-minute changes. Example :
467
468 Signed-off-by: Random J Developer <random@developer.example.org>
469 [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
470 Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
471
Jeremiah Mahler305af082014-05-22 00:04:26 -0700472This practice is particularly helpful if you maintain a stable branch and
Willy Tarreauadbd5882008-06-03 00:20:28 +0200473want at the same time to credit the author, track changes, merge the fix,
474and protect the submitter from complaints. Note that under no circumstances
475can you change the author's identity (the From header), as it is the one
476which appears in the changelog.
477
Jeremiah Mahler305af082014-05-22 00:04:26 -0700478Special note to back-porters: It seems to be a common and useful practice
Willy Tarreauadbd5882008-06-03 00:20:28 +0200479to insert an indication of the origin of a patch at the top of the commit
480message (just after the subject line) to facilitate tracking. For instance,
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700481here's what we see in a 3.x-stable release:
Willy Tarreauadbd5882008-06-03 00:20:28 +0200482
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700483Date: Tue Oct 7 07:26:38 2014 -0400
Willy Tarreauadbd5882008-06-03 00:20:28 +0200484
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700485 libata: Un-break ATA blacklist
Willy Tarreauadbd5882008-06-03 00:20:28 +0200486
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700487 commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
Willy Tarreauadbd5882008-06-03 00:20:28 +0200488
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700489And here's what might appear in an older kernel once a patch is backported:
Willy Tarreauadbd5882008-06-03 00:20:28 +0200490
491 Date: Tue May 13 22:12:27 2008 +0200
492
493 wireless, airo: waitbusy() won't delay
494
495 [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
496
497Whatever the format, this information provides a valuable help to people
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700498tracking your trees, and to people trying to troubleshoot bugs in your
Willy Tarreauadbd5882008-06-03 00:20:28 +0200499tree.
500
Linus Torvalds1da177e2005-04-16 15:20:36 -0700501
Jonathan Corbetccae8612014-12-23 08:49:18 -070050212) When to use Acked-by: and Cc:
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700503---------------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700504
Andrew Morton0f44cd22007-06-08 13:46:45 -0700505The Signed-off-by: tag indicates that the signer was involved in the
506development of the patch, or that he/she was in the patch's delivery path.
507
508If a person was not directly involved in the preparation or handling of a
509patch but wishes to signify and record their approval of it then they can
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700510ask to have an Acked-by: line added to the patch's changelog.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700511
512Acked-by: is often used by the maintainer of the affected code when that
513maintainer neither contributed to nor forwarded the patch.
514
515Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
516has at least reviewed the patch and has indicated acceptance. Hence patch
517mergers will sometimes manually convert an acker's "yep, looks good to me"
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700518into an Acked-by: (but note that it is usually better to ask for an
519explicit ack).
Andrew Morton0f44cd22007-06-08 13:46:45 -0700520
521Acked-by: does not necessarily indicate acknowledgement of the entire patch.
522For example, if a patch affects multiple subsystems and has an Acked-by: from
523one subsystem maintainer then this usually indicates acknowledgement of just
524the part which affects that maintainer's code. Judgement should be used here.
Jonathan Corbetef402032008-03-28 11:22:38 -0600525When in doubt people should refer to the original discussion in the mailing
Andrew Morton0f44cd22007-06-08 13:46:45 -0700526list archives.
527
Jonathan Corbetef402032008-03-28 11:22:38 -0600528If a person has had the opportunity to comment on a patch, but has not
529provided such comments, you may optionally add a "Cc:" tag to the patch.
530This is the only tag which might be added without an explicit action by the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700531person it names - but it should indicate that this person was copied on the
532patch. This tag documents that potentially interested parties
533have been included in the discussion.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700534
Jonathan Corbetef402032008-03-28 11:22:38 -0600535
Jonathan Corbetccae8612014-12-23 08:49:18 -070053613) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700537--------------------------------------------------------------------------
Jonathan Corbetbbb0a4242009-01-16 09:49:50 -0700538
Dan Carpenterd75ef702014-10-29 13:01:36 +0300539The Reported-by tag gives credit to people who find bugs and report them and it
540hopefully inspires them to help us again in the future. Please note that if
541the bug was reported in private, then ask for permission first before using the
542Reported-by tag.
Jonathan Corbetef402032008-03-28 11:22:38 -0600543
544A Tested-by: tag indicates that the patch has been successfully tested (in
545some environment) by the person named. This tag informs maintainers that
546some testing has been performed, provides a means to locate testers for
547future patches, and ensures credit for the testers.
548
549Reviewed-by:, instead, indicates that the patch has been reviewed and found
550acceptable according to the Reviewer's Statement:
551
552 Reviewer's statement of oversight
553
554 By offering my Reviewed-by: tag, I state that:
555
556 (a) I have carried out a technical review of this patch to
557 evaluate its appropriateness and readiness for inclusion into
558 the mainline kernel.
559
560 (b) Any problems, concerns, or questions relating to the patch
561 have been communicated back to the submitter. I am satisfied
562 with the submitter's response to my comments.
563
564 (c) While there may be things that could be improved with this
565 submission, I believe that it is, at this time, (1) a
566 worthwhile modification to the kernel, and (2) free of known
567 issues which would argue against its inclusion.
568
569 (d) While I have reviewed the patch and believe it to be sound, I
570 do not (unless explicitly stated elsewhere) make any
571 warranties or guarantees that it will achieve its stated
572 purpose or function properly in any given situation.
573
574A Reviewed-by tag is a statement of opinion that the patch is an
575appropriate modification of the kernel without any remaining serious
576technical issues. Any interested reviewer (who has done the work) can
577offer a Reviewed-by tag for a patch. This tag serves to give credit to
578reviewers and to inform maintainers of the degree of review which has been
579done on the patch. Reviewed-by: tags, when supplied by reviewers known to
580understand the subject area and to perform thorough reviews, will normally
Pavel Machek5801da12009-06-04 16:26:50 +0200581increase the likelihood of your patch getting into the kernel.
Jonathan Corbetef402032008-03-28 11:22:38 -0600582
Mugunthan V N8543ae12013-04-29 16:18:17 -0700583A Suggested-by: tag indicates that the patch idea is suggested by the person
584named and ensures credit to the person for the idea. Please note that this
585tag should not be added without the reporter's permission, especially if the
586idea was not posted in a public forum. That said, if we diligently credit our
587idea reporters, they will, hopefully, be inspired to help us again in the
588future.
589
Jacob Keller8401aa12014-06-06 14:36:39 -0700590A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
591is used to make it easy to determine where a bug originated, which can help
592review a bug fix. This tag also assists the stable kernel team in determining
593which stable kernel versions should receive your fix. This is the preferred
594method for indicating a bug fixed by the patch. See #2 above for more details.
595
Jonathan Corbetef402032008-03-28 11:22:38 -0600596
Jonathan Corbetccae8612014-12-23 08:49:18 -070059714) The canonical patch format
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700598------------------------------
599
600This section describes how the patch itself should be formatted. Note
601that, if you have your patches stored in a git repository, proper patch
602formatting can be had with "git format-patch". The tools cannot create
603the necessary text, though, so read the instructions below anyway.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700604
Paul Jackson75f84262005-10-02 18:01:42 -0700605The canonical patch subject line is:
606
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700607 Subject: [PATCH 001/123] subsystem: summary phrase
Paul Jackson75f84262005-10-02 18:01:42 -0700608
609The canonical patch message body contains the following:
610
Jonathan Corbetccae8612014-12-23 08:49:18 -0700611 - A "from" line specifying the patch author (only needed if the person
612 sending the patch is not the author).
Paul Jackson75f84262005-10-02 18:01:42 -0700613
614 - An empty line.
615
616 - The body of the explanation, which will be copied to the
617 permanent changelog to describe this patch.
618
619 - The "Signed-off-by:" lines, described above, which will
620 also go in the changelog.
621
622 - A marker line containing simply "---".
623
624 - Any additional comments not suitable for the changelog.
625
626 - The actual patch (diff output).
627
628The Subject line format makes it very easy to sort the emails
629alphabetically by subject line - pretty much any email reader will
630support that - since because the sequence number is zero-padded,
631the numerical and alphabetic sort is the same.
632
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700633The "subsystem" in the email's Subject should identify which
634area or subsystem of the kernel is being patched.
635
636The "summary phrase" in the email's Subject should concisely
637describe the patch which that email contains. The "summary
638phrase" should not be a filename. Do not use the same "summary
Randy Dunlap66effdc2007-05-09 02:33:42 -0700639phrase" for every patch in a whole patch series (where a "patch
640series" is an ordered sequence of multiple, related patches).
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700641
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400642Bear in mind that the "summary phrase" of your email becomes a
643globally-unique identifier for that patch. It propagates all the way
644into the git changelog. The "summary phrase" may later be used in
645developer discussions which refer to the patch. People will want to
646google for the "summary phrase" to read discussion regarding that
647patch. It will also be the only thing that people may quickly see
648when, two or three months later, they are going through perhaps
649thousands of patches using tools such as "gitk" or "git log
650--oneline".
651
652For these reasons, the "summary" must be no more than 70-75
653characters, and it must describe both what the patch changes, as well
654as why the patch might be necessary. It is challenging to be both
655succinct and descriptive, but that is what a well-written summary
656should do.
657
658The "summary phrase" may be prefixed by tags enclosed in square
659brackets: "Subject: [PATCH tag] <summary phrase>". The tags are not
660considered part of the summary phrase, but describe how the patch
661should be treated. Common tags might include a version descriptor if
662the multiple versions of the patch have been sent out in response to
663comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
664comments. If there are four patches in a patch series the individual
665patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
666that developers understand the order in which the patches should be
667applied and that they have reviewed or applied all of the patches in
668the patch series.
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700669
670A couple of example Subjects:
671
672 Subject: [patch 2/5] ext2: improve scalability of bitmap searching
673 Subject: [PATCHv2 001/207] x86: fix eflags tracking
Paul Jackson75f84262005-10-02 18:01:42 -0700674
675The "from" line must be the very first line in the message body,
676and has the form:
677
678 From: Original Author <author@example.com>
679
680The "from" line specifies who will be credited as the author of the
681patch in the permanent changelog. If the "from" line is missing,
682then the "From:" line from the email header will be used to determine
683the patch author in the changelog.
684
685The explanation body will be committed to the permanent source
686changelog, so should make sense to a competent reader who has long
687since forgotten the immediate details of the discussion that might
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400688have led to this patch. Including symptoms of the failure which the
689patch addresses (kernel log messages, oops messages, etc.) is
690especially useful for people who might be searching the commit logs
691looking for the applicable patch. If a patch fixes a compile failure,
692it may not be necessary to include _all_ of the compile failures; just
693enough that it is likely that someone searching for the patch can find
694it. As in the "summary phrase", it is important to be both succinct as
695well as descriptive.
Paul Jackson75f84262005-10-02 18:01:42 -0700696
697The "---" marker line serves the essential purpose of marking for patch
698handling tools where the changelog message ends.
699
700One good use for the additional comments after the "---" marker is for
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400701a diffstat, to show what files have changed, and the number of
702inserted and deleted lines per file. A diffstat is especially useful
703on bigger patches. Other comments relevant only to the moment or the
704maintainer, not suitable for the permanent changelog, should also go
705here. A good example of such comments might be "patch changelogs"
706which describe what has changed between the v1 and v2 version of the
707patch.
708
709If you are going to include a diffstat after the "---" marker, please
710use diffstat options "-p 1 -w 70" so that filenames are listed from
711the top of the kernel source tree and don't use too much horizontal
Josh Triplett8e3072a2014-04-03 14:48:30 -0700712space (easily fit in 80 columns, maybe with some indentation). (git
713generates appropriate diffstats by default.)
Paul Jackson75f84262005-10-02 18:01:42 -0700714
715See more details on the proper patch format in the following
716references.
717
718
Jonathan Corbetccae8612014-12-23 08:49:18 -070071915) Sending "git pull" requests
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700720-------------------------------
Randy Dunlap84da7c02005-06-28 20:45:30 -0700721
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700722If you have a series of patches, it may be most convenient to have the
723maintainer pull them directly into the subsystem repository with a
724"git pull" operation. Note, however, that pulling patches from a developer
725requires a higher degree of trust than taking patches from a mailing list.
726As a result, many subsystem maintainers are reluctant to take pull
727requests, especially from new, unknown developers.
Randy Dunlap14863612008-07-27 20:44:24 -0700728
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700729A pull request should have [GIT] or [PULL] in the subject line. The
730request itself should include the repository name and the branch of
731interest on a single line; it should look something like:
Randy Dunlap14863612008-07-27 20:44:24 -0700732
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700733 Please pull from
Randy Dunlap14863612008-07-27 20:44:24 -0700734
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700735 git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
Randy Dunlap14863612008-07-27 20:44:24 -0700736
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700737 to get these changes:"
Randy Dunlap14863612008-07-27 20:44:24 -0700738
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700739A pull request should also include an overall message saying what will be
740included in the request, a "git shortlog" listing of the patches
741themselves, and a diffstat showing the overall effect of the patch series.
742The easiest way to get all this information together is, of course, to let
743git do it for you with the "git request-pull" command.
Randy Dunlap14863612008-07-27 20:44:24 -0700744
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700745Some maintainers (including Linus) want to see pull requests from signed
746commits; that increases their confidence that the request actually came
747from you. Linus, in particular, will not pull from public hosting sites
748like GitHub in the absence of a signed tag.
Randy Dunlap14863612008-07-27 20:44:24 -0700749
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700750The first step toward creating such tags is to make a GNUPG key and get it
751signed by one or more core kernel developers. This step can be hard for
752new developers, but there is no way around it. Attending conferences can
753be a good way to find developers who can sign your key.
Randy Dunlap14863612008-07-27 20:44:24 -0700754
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700755Once you have prepared a patch series in git that you wish to have somebody
756pull, create a signed tag with "git tag -s". This will create a new tag
757identifying the last commit in the series and containing a signature
758created with your private key. You will also have the opportunity to add a
759changelog-style message to the tag; this is an ideal place to describe the
760effects of the pull request as a whole.
761
762If the tree the maintainer will be pulling from is not the repository you
763are working from, don't forget to push the signed tag explicitly to the
764public tree.
765
766When generating your pull request, use the signed tag as the target. A
767command like this will do the trick:
768
769 git request-pull master git://my.public.tree/linux.git my-signed-tag
Randy Dunlap84da7c02005-06-28 20:45:30 -0700770
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800771
772----------------------
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700773SECTION 2 - REFERENCES
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800774----------------------
775
776Andrew Morton, "The perfect patch" (tpp).
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700777 <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800778
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700779Jeff Garzik, "Linux kernel patch submission format".
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800780 <http://linux.yyz.us/patch-format.html>
781
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700782Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
Vikram Narayananf5039932011-05-23 12:01:25 -0700783 <http://www.kroah.com/log/linux/maintainer.html>
784 <http://www.kroah.com/log/linux/maintainer-02.html>
785 <http://www.kroah.com/log/linux/maintainer-03.html>
786 <http://www.kroah.com/log/linux/maintainer-04.html>
787 <http://www.kroah.com/log/linux/maintainer-05.html>
Sudip Mukherjee7e0dae62014-09-07 11:26:12 -0700788 <http://www.kroah.com/log/linux/maintainer-06.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800789
Randy Dunlapbc7455f2006-07-30 03:03:45 -0700790NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700791 <https://lkml.org/lkml/2005/7/11/336>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800792
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700793Kernel Documentation/CodingStyle:
Qi Yong4db29c12007-06-12 13:06:49 +0800794 <http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800795
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700796Linus Torvalds's mail on the canonical patch format:
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800797 <http://lkml.org/lkml/2005/4/7/183>
Andi Kleen95367272008-10-15 22:02:02 -0700798
799Andi Kleen, "On submitting kernel patches"
Lucas De Marchi25985ed2011-03-30 22:57:33 -0300800 Some strategies to get difficult or controversial changes in.
Andi Kleen95367272008-10-15 22:02:02 -0700801 http://halobates.de/on-submitting-patches.pdf
802
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800803--