blob: 482c74947de02939eebfca089a344373707bf69d [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
27
281) "diff -up"
29------------
30
Josh Triplett8e3072a2014-04-03 14:48:30 -070031Use "diff -up" or "diff -uprN" to create patches. git generates patches
32in this form by default; if you're using git, you can skip this section
33entirely.
Linus Torvalds1da177e2005-04-16 15:20:36 -070034
35All changes to the Linux kernel occur in the form of patches, as
36generated by diff(1). When creating your patch, make sure to create it
37in "unified diff" format, as supplied by the '-u' argument to diff(1).
38Also, please use the '-p' argument which shows which C function each
39change is in - that makes the resultant diff a lot easier to read.
40Patches should be based in the root kernel source directory,
41not in any lower subdirectory.
42
43To create a patch for a single file, it is often sufficient to do:
44
Randy Dunlap84da7c02005-06-28 20:45:30 -070045 SRCTREE= linux-2.6
Linus Torvalds1da177e2005-04-16 15:20:36 -070046 MYFILE= drivers/net/mydriver.c
47
48 cd $SRCTREE
49 cp $MYFILE $MYFILE.orig
50 vi $MYFILE # make your change
51 cd ..
52 diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch
53
54To create a patch for multiple files, you should unpack a "vanilla",
55or unmodified kernel source tree, and generate a diff against your
56own source tree. For example:
57
Randy Dunlap84da7c02005-06-28 20:45:30 -070058 MYSRC= /devel/linux-2.6
Linus Torvalds1da177e2005-04-16 15:20:36 -070059
Randy Dunlap84da7c02005-06-28 20:45:30 -070060 tar xvfz linux-2.6.12.tar.gz
61 mv linux-2.6.12 linux-2.6.12-vanilla
62 diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \
63 linux-2.6.12-vanilla $MYSRC > /tmp/patch
Linus Torvalds1da177e2005-04-16 15:20:36 -070064
65"dontdiff" is a list of files which are generated by the kernel during
66the build process, and should be ignored in any diff(1)-generated
Randy Dunlap84da7c02005-06-28 20:45:30 -070067patch. The "dontdiff" file is included in the kernel tree in
Randy Dunlap755727b2013-03-08 12:43:35 -0800682.6.12 and later.
Linus Torvalds1da177e2005-04-16 15:20:36 -070069
70Make sure your patch does not include any extra files which do not
71belong in a patch submission. Make sure to review your patch -after-
72generated it with diff(1), to ensure accuracy.
73
Josh Triplett8e3072a2014-04-03 14:48:30 -070074If your changes produce a lot of deltas, you need to split them into
75individual patches which modify things in logical stages; see section
76#3. This will facilitate easier reviewing by other kernel developers,
77very important if you want your patch accepted.
Linus Torvalds1da177e2005-04-16 15:20:36 -070078
Josh Triplett8e3072a2014-04-03 14:48:30 -070079If you're using git, "git rebase -i" can help you with this process. If
80you're not using git, quilt <http://savannah.nongnu.org/projects/quilt>
81is another popular alternative.
Randy Dunlap84da7c02005-06-28 20:45:30 -070082
83
Linus Torvalds1da177e2005-04-16 15:20:36 -070084
852) Describe your changes.
86
Johannes Weiner7b9828d2014-08-05 23:32:56 -070087Describe your problem. Whether your patch is a one-line bug fix or
885000 lines of a new feature, there must be an underlying problem that
89motivated you to do this work. Convince the reviewer that there is a
90problem worth fixing and that it makes sense for them to read past the
91first paragraph.
Linus Torvalds1da177e2005-04-16 15:20:36 -070092
Johannes Weiner7b9828d2014-08-05 23:32:56 -070093Describe user-visible impact. Straight up crashes and lockups are
94pretty convincing, but not all bugs are that blatant. Even if the
95problem was spotted during code review, describe the impact you think
96it can have on users. Keep in mind that the majority of Linux
97installations run kernels from secondary stable trees or
98vendor/product-specific trees that cherry-pick only specific patches
99from upstream, so include anything that could help route your change
100downstream: provoking circumstances, excerpts from dmesg, crash
101descriptions, performance regressions, latency spikes, lockups, etc.
102
103Quantify optimizations and trade-offs. If you claim improvements in
104performance, memory consumption, stack footprint, or binary size,
105include numbers that back them up. But also describe non-obvious
106costs. Optimizations usually aren't free but trade-offs between CPU,
107memory, and readability; or, when it comes to heuristics, between
108different workloads. Describe the expected downsides of your
109optimization so that the reviewer can weigh costs against benefits.
110
111Once the problem is established, describe what you are actually doing
112about it in technical detail. It's important to describe the change
113in plain English for the reviewer to verify that the code is behaving
114as you intend it to.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700115
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400116The maintainer will thank you if you write your patch description in a
117form which can be easily pulled into Linux's source code management
118system, git, as a "commit log". See #15, below.
119
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700120Solve only one problem per patch. If your description starts to get
121long, that's a sign that you probably need to split up your patch.
122See #3, next.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700123
Randy Dunlapd89b1942010-08-09 17:20:21 -0700124When you submit or resubmit a patch or patch series, include the
125complete patch description and justification for it. Don't just
126say that this is version N of the patch (series). Don't expect the
127patch merger to refer back to earlier patch versions or referenced
128URLs to find the patch description and put that into the patch.
129I.e., the patch (series) and its description should be self-contained.
130This benefits both the patch merger(s) and reviewers. Some reviewers
131probably didn't even receive earlier versions of the patch.
132
Josh Triplett74a475a2014-04-03 14:48:28 -0700133Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
134instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
135to do frotz", as if you are giving orders to the codebase to change
136its behaviour.
137
Randy Dunlapd89b1942010-08-09 17:20:21 -0700138If the patch fixes a logged bug entry, refer to that bug entry by
Josh Triplett9547c702014-04-03 14:48:29 -0700139number and URL. If the patch follows from a mailing list discussion,
140give a URL to the mailing list archive; use the https://lkml.kernel.org/
141redirector with a Message-Id, to ensure that the links cannot become
142stale.
143
144However, try to make your explanation understandable without external
145resources. In addition to giving a URL to a mailing list archive or
146bug, summarize the relevant points of the discussion that led to the
147patch as submitted.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700148
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700149If you want to refer to a specific commit, don't just refer to the
150SHA-1 ID of the commit. Please also include the oneline summary of
151the commit, to make it easier for reviewers to know what it is about.
152Example:
153
154 Commit e21d2170f36602ae2708 ("video: remove unnecessary
155 platform_set_drvdata()") removed the unnecessary
156 platform_set_drvdata(), but left the variable "dev" unused,
157 delete it.
158
Jacob Keller8401aa12014-06-06 14:36:39 -0700159If your patch fixes a bug in a specific commit, e.g. you found an issue using
160git-bisect, please use the 'Fixes:' tag with the first 12 characters of the
161SHA-1 ID, and the one line summary.
162Example:
163
164 Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")
165
166The following git-config settings can be used to add a pretty format for
167outputting the above style in the git log or git show commands
168
169 [core]
170 abbrev = 12
171 [pretty]
172 fixes = Fixes: %h (\"%s\")
Linus Torvalds1da177e2005-04-16 15:20:36 -0700173
1743) Separate your changes.
175
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800176Separate _logical changes_ into a single patch file.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700177
178For example, if your changes include both bug fixes and performance
179enhancements for a single driver, separate those changes into two
180or more patches. If your changes include an API update, and a new
181driver which uses that new API, separate those into two patches.
182
183On the other hand, if you make a single change to numerous files,
184group those changes into a single patch. Thus a single logical change
185is contained within a single patch.
186
187If one patch depends on another patch in order for a change to be
188complete, that is OK. Simply note "this patch depends on patch X"
189in your patch description.
190
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800191If you cannot condense your patch set into a smaller set of patches,
192then only post say 15 or so at a time and wait for review and integration.
193
194
Linus Torvalds1da177e2005-04-16 15:20:36 -0700195
Andy Whitcroft0a920b52007-06-01 00:46:48 -07001964) Style check your changes.
197
198Check your patch for basic style violations, details of which can be
199found in Documentation/CodingStyle. Failure to do so simply wastes
Linus Nilssonf56d35e2007-07-21 17:49:06 +0200200the reviewers time and will get your patch rejected, probably
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700201without even being read.
202
203At a minimum you should check your patches with the patch style
Andre Haupta570ab62007-09-11 15:23:47 -0700204checker prior to submission (scripts/checkpatch.pl). You should
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700205be able to justify all violations that remain in your patch.
206
207
208
2095) Select e-mail destination.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700210
211Look through the MAINTAINERS file and the source code, and determine
212if your change applies to a specific subsystem of the kernel, with
Michel Machadoe52d2e12012-04-02 22:10:53 -0400213an assigned maintainer. If so, e-mail that person. The script
214scripts/get_maintainer.pl can be very useful at this step.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700215
216If no maintainer is listed, or the maintainer does not respond, send
217your patch to the primary Linux kernel developer's mailing list,
218linux-kernel@vger.kernel.org. Most kernel developers monitor this
219e-mail list, and can comment on your changes.
220
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800221
222Do not send more than 15 patches at once to the vger mailing lists!!!
223
224
Linus Torvalds1da177e2005-04-16 15:20:36 -0700225Linus Torvalds is the final arbiter of all changes accepted into the
Linus Torvalds99ddcc72007-01-23 14:22:35 -0800226Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
227He gets a lot of e-mail, so typically you should do your best to -avoid-
228sending him e-mail.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700229
230Patches which are bug fixes, are "obvious" changes, or similarly
231require little discussion should be sent or CC'd to Linus. Patches
232which require discussion or do not have a clear advantage should
233usually be sent first to linux-kernel. Only after the patch is
234discussed should the patch then be submitted to Linus.
235
Linus Torvalds1da177e2005-04-16 15:20:36 -0700236
237
Andy Whitcroft0a920b52007-06-01 00:46:48 -07002386) Select your CC (e-mail carbon copy) list.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700239
240Unless you have a reason NOT to do so, CC linux-kernel@vger.kernel.org.
241
242Other kernel developers besides Linus need to be aware of your change,
243so that they may comment on it and offer code review and suggestions.
244linux-kernel is the primary Linux kernel developer mailing list.
245Other mailing lists are available for specific subsystems, such as
246USB, framebuffer devices, the VFS, the SCSI subsystem, etc. See the
247MAINTAINERS file for a mailing list that relates specifically to
248your change.
249
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800250Majordomo lists of VGER.KERNEL.ORG at:
251 <http://vger.kernel.org/vger-lists.html>
252
Paul Jackson1caf1f02005-07-31 22:34:48 -0700253If changes affect userland-kernel interfaces, please send
254the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
255a man-pages patch, or at least a notification of the change,
256so that some information makes its way into the manual pages.
257
Michael Brunner8103b5c2009-08-04 00:41:11 +0200258Even if the maintainer did not respond in step #5, make sure to ALWAYS
Linus Torvalds1da177e2005-04-16 15:20:36 -0700259copy the maintainer when you change their code.
260
261For small patches you may want to CC the Trivial Patch Monkey
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200262trivial@kernel.org which collects "trivial" patches. Have a look
263into the MAINTAINERS file for its current manager.
264Trivial patches must qualify for one of the following rules:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700265 Spelling fixes in documentation
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700266 Spelling fixes which could break grep(1)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700267 Warning fixes (cluttering with useless warnings is bad)
268 Compilation fixes (only if they are actually correct)
269 Runtime fixes (only if they actually fix things)
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700270 Removing use of deprecated functions/macros (eg. check_region)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700271 Contact detail and documentation fixes
272 Non-portable code replaced by portable code (even in arch-specific,
273 since people copy, as long as it's trivial)
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700274 Any fix by the author/maintainer of the file (ie. patch monkey
Linus Torvalds1da177e2005-04-16 15:20:36 -0700275 in re-transmission mode)
Randy Dunlap84da7c02005-06-28 20:45:30 -0700276
Linus Torvalds1da177e2005-04-16 15:20:36 -0700277
278
Andy Whitcroft0a920b52007-06-01 00:46:48 -07002797) No MIME, no links, no compression, no attachments. Just plain text.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700280
281Linus and other kernel developers need to be able to read and comment
282on the changes you are submitting. It is important for a kernel
283developer to be able to "quote" your changes, using standard e-mail
284tools, so that they may comment on specific portions of your code.
285
286For this reason, all patches should be submitting e-mail "inline".
287WARNING: Be wary of your editor's word-wrap corrupting your patch,
288if you choose to cut-n-paste your patch.
289
290Do not attach the patch as a MIME attachment, compressed or not.
291Many popular e-mail applications will not always transmit a MIME
292attachment as plain text, making it impossible to comment on your
293code. A MIME attachment also takes Linus a bit more time to process,
294decreasing the likelihood of your MIME-attached change being accepted.
295
296Exception: If your mailer is mangling patches then someone may ask
297you to re-send them using MIME.
298
Michael Opdenacker097091c2008-02-03 18:06:58 +0200299See Documentation/email-clients.txt for hints about configuring
300your e-mail client so that it sends your patches untouched.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700301
Andy Whitcroft0a920b52007-06-01 00:46:48 -07003028) E-mail size.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700303
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700304When sending patches to Linus, always follow step #7.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700305
306Large changes are not appropriate for mailing lists, and some
Randy Dunlap4932be72009-10-01 15:44:06 -0700307maintainers. If your patch, uncompressed, exceeds 300 kB in size,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700308it is preferred that you store your patch on an Internet-accessible
309server, and provide instead a URL (link) pointing to your patch.
310
311
312
Andy Whitcroft0a920b52007-06-01 00:46:48 -07003139) Name your kernel version.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700314
315It is important to note, either in the subject line or in the patch
316description, the kernel version to which this patch applies.
317
318If the patch does not apply cleanly to the latest kernel version,
319Linus will not apply it.
320
321
322
Andy Whitcroft0a920b52007-06-01 00:46:48 -070032310) Don't get discouraged. Re-submit.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700324
325After you have submitted your change, be patient and wait. If Linus
326likes your change and applies it, it will appear in the next version
327of the kernel that he releases.
328
329However, if your change doesn't appear in the next version of the
330kernel, there could be any number of reasons. It's YOUR job to
331narrow down those reasons, correct what was wrong, and submit your
332updated change.
333
334It is quite common for Linus to "drop" your patch without comment.
335That's the nature of the system. If he drops your patch, it could be
336due to
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700337* Your patch did not apply cleanly to the latest kernel version.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700338* Your patch was not sufficiently discussed on linux-kernel.
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700339* A style issue (see section 2).
340* An e-mail formatting issue (re-read this section).
341* A technical problem with your change.
342* He gets tons of e-mail, and yours got lost in the shuffle.
343* You are being annoying.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700344
345When in doubt, solicit comments on linux-kernel mailing list.
346
347
348
Andy Whitcroft0a920b52007-06-01 00:46:48 -070034911) Include PATCH in the subject
Linus Torvalds1da177e2005-04-16 15:20:36 -0700350
351Due to high e-mail traffic to Linus, and to linux-kernel, it is common
352convention to prefix your subject line with [PATCH]. This lets Linus
353and other kernel developers more easily distinguish patches from other
354e-mail discussions.
355
356
357
Andy Whitcroft0a920b52007-06-01 00:46:48 -070035812) Sign your work
Linus Torvalds1da177e2005-04-16 15:20:36 -0700359
360To improve tracking of who did what, especially with patches that can
361percolate to their final resting place in the kernel through several
362layers of maintainers, we've introduced a "sign-off" procedure on
363patches that are being emailed around.
364
365The sign-off is a simple line at the end of the explanation for the
366patch, which certifies that you wrote it or otherwise have the right to
Zac Storerdb12fb82011-08-13 12:34:45 -0700367pass it on as an open-source patch. The rules are pretty simple: if you
Linus Torvalds1da177e2005-04-16 15:20:36 -0700368can certify the below:
369
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700370 Developer's Certificate of Origin 1.1
Linus Torvalds1da177e2005-04-16 15:20:36 -0700371
372 By making a contribution to this project, I certify that:
373
374 (a) The contribution was created in whole or in part by me and I
375 have the right to submit it under the open source license
376 indicated in the file; or
377
378 (b) The contribution is based upon previous work that, to the best
379 of my knowledge, is covered under an appropriate open source
380 license and I have the right under that license to submit that
381 work with modifications, whether created in whole or in part
382 by me, under the same open source license (unless I am
383 permitted to submit under a different license), as indicated
384 in the file; or
385
386 (c) The contribution was provided directly to me by some other
387 person who certified (a), (b) or (c) and I have not modified
388 it.
389
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700390 (d) I understand and agree that this project and the contribution
391 are public and that a record of the contribution (including all
392 personal information I submit with it, including my sign-off) is
393 maintained indefinitely and may be redistributed consistent with
394 this project or the open source license(s) involved.
395
Linus Torvalds1da177e2005-04-16 15:20:36 -0700396then you just add a line saying
397
Alexey Dobriyan9fd55592005-06-25 14:59:34 -0700398 Signed-off-by: Random J Developer <random@developer.example.org>
Linus Torvalds1da177e2005-04-16 15:20:36 -0700399
Greg KHaf45f322006-09-12 20:35:52 -0700400using your real name (sorry, no pseudonyms or anonymous contributions.)
401
Linus Torvalds1da177e2005-04-16 15:20:36 -0700402Some people also put extra tags at the end. They'll just be ignored for
403now, but you can do this to mark internal company procedures or just
404point out some special detail about the sign-off.
405
Willy Tarreauadbd5882008-06-03 00:20:28 +0200406If you are a subsystem or branch maintainer, sometimes you need to slightly
407modify patches you receive in order to merge them, because the code is not
408exactly the same in your tree and the submitters'. If you stick strictly to
409rule (c), you should ask the submitter to rediff, but this is a totally
410counter-productive waste of time and energy. Rule (b) allows you to adjust
411the code, but then it is very impolite to change one submitter's code and
412make him endorse your bugs. To solve this problem, it is recommended that
413you add a line between the last Signed-off-by header and yours, indicating
414the nature of your changes. While there is nothing mandatory about this, it
415seems like prepending the description with your mail and/or name, all
416enclosed in square brackets, is noticeable enough to make it obvious that
417you are responsible for last-minute changes. Example :
418
419 Signed-off-by: Random J Developer <random@developer.example.org>
420 [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
421 Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
422
Jeremiah Mahler305af082014-05-22 00:04:26 -0700423This practice is particularly helpful if you maintain a stable branch and
Willy Tarreauadbd5882008-06-03 00:20:28 +0200424want at the same time to credit the author, track changes, merge the fix,
425and protect the submitter from complaints. Note that under no circumstances
426can you change the author's identity (the From header), as it is the one
427which appears in the changelog.
428
Jeremiah Mahler305af082014-05-22 00:04:26 -0700429Special note to back-porters: It seems to be a common and useful practice
Willy Tarreauadbd5882008-06-03 00:20:28 +0200430to insert an indication of the origin of a patch at the top of the commit
431message (just after the subject line) to facilitate tracking. For instance,
432here's what we see in 2.6-stable :
433
434 Date: Tue May 13 19:10:30 2008 +0000
435
436 SCSI: libiscsi regression in 2.6.25: fix nop timer handling
437
438 commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream
439
440And here's what appears in 2.4 :
441
442 Date: Tue May 13 22:12:27 2008 +0200
443
444 wireless, airo: waitbusy() won't delay
445
446 [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
447
448Whatever the format, this information provides a valuable help to people
449tracking your trees, and to people trying to trouble-shoot bugs in your
450tree.
451
Linus Torvalds1da177e2005-04-16 15:20:36 -0700452
Jonathan Corbetef402032008-03-28 11:22:38 -060045313) When to use Acked-by: and Cc:
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700454
Andrew Morton0f44cd22007-06-08 13:46:45 -0700455The Signed-off-by: tag indicates that the signer was involved in the
456development of the patch, or that he/she was in the patch's delivery path.
457
458If a person was not directly involved in the preparation or handling of a
459patch but wishes to signify and record their approval of it then they can
460arrange to have an Acked-by: line added to the patch's changelog.
461
462Acked-by: is often used by the maintainer of the affected code when that
463maintainer neither contributed to nor forwarded the patch.
464
465Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
466has at least reviewed the patch and has indicated acceptance. Hence patch
467mergers will sometimes manually convert an acker's "yep, looks good to me"
468into an Acked-by:.
469
470Acked-by: does not necessarily indicate acknowledgement of the entire patch.
471For example, if a patch affects multiple subsystems and has an Acked-by: from
472one subsystem maintainer then this usually indicates acknowledgement of just
473the part which affects that maintainer's code. Judgement should be used here.
Jonathan Corbetef402032008-03-28 11:22:38 -0600474When in doubt people should refer to the original discussion in the mailing
Andrew Morton0f44cd22007-06-08 13:46:45 -0700475list archives.
476
Jonathan Corbetef402032008-03-28 11:22:38 -0600477If a person has had the opportunity to comment on a patch, but has not
478provided such comments, you may optionally add a "Cc:" tag to the patch.
479This is the only tag which might be added without an explicit action by the
480person it names. This tag documents that potentially interested parties
481have been included in the discussion
Andrew Morton0f44cd22007-06-08 13:46:45 -0700482
Jonathan Corbetef402032008-03-28 11:22:38 -0600483
Jacob Keller8401aa12014-06-06 14:36:39 -070048414) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
Jonathan Corbetbbb0a4242009-01-16 09:49:50 -0700485
486If this patch fixes a problem reported by somebody else, consider adding a
487Reported-by: tag to credit the reporter for their contribution. Please
488note that this tag should not be added without the reporter's permission,
489especially if the problem was not reported in a public forum. That said,
490if we diligently credit our bug reporters, they will, hopefully, be
491inspired to help us again in the future.
Jonathan Corbetef402032008-03-28 11:22:38 -0600492
493A Tested-by: tag indicates that the patch has been successfully tested (in
494some environment) by the person named. This tag informs maintainers that
495some testing has been performed, provides a means to locate testers for
496future patches, and ensures credit for the testers.
497
498Reviewed-by:, instead, indicates that the patch has been reviewed and found
499acceptable according to the Reviewer's Statement:
500
501 Reviewer's statement of oversight
502
503 By offering my Reviewed-by: tag, I state that:
504
505 (a) I have carried out a technical review of this patch to
506 evaluate its appropriateness and readiness for inclusion into
507 the mainline kernel.
508
509 (b) Any problems, concerns, or questions relating to the patch
510 have been communicated back to the submitter. I am satisfied
511 with the submitter's response to my comments.
512
513 (c) While there may be things that could be improved with this
514 submission, I believe that it is, at this time, (1) a
515 worthwhile modification to the kernel, and (2) free of known
516 issues which would argue against its inclusion.
517
518 (d) While I have reviewed the patch and believe it to be sound, I
519 do not (unless explicitly stated elsewhere) make any
520 warranties or guarantees that it will achieve its stated
521 purpose or function properly in any given situation.
522
523A Reviewed-by tag is a statement of opinion that the patch is an
524appropriate modification of the kernel without any remaining serious
525technical issues. Any interested reviewer (who has done the work) can
526offer a Reviewed-by tag for a patch. This tag serves to give credit to
527reviewers and to inform maintainers of the degree of review which has been
528done on the patch. Reviewed-by: tags, when supplied by reviewers known to
529understand the subject area and to perform thorough reviews, will normally
Pavel Machek5801da12009-06-04 16:26:50 +0200530increase the likelihood of your patch getting into the kernel.
Jonathan Corbetef402032008-03-28 11:22:38 -0600531
Mugunthan V N8543ae12013-04-29 16:18:17 -0700532A Suggested-by: tag indicates that the patch idea is suggested by the person
533named and ensures credit to the person for the idea. Please note that this
534tag should not be added without the reporter's permission, especially if the
535idea was not posted in a public forum. That said, if we diligently credit our
536idea reporters, they will, hopefully, be inspired to help us again in the
537future.
538
Jacob Keller8401aa12014-06-06 14:36:39 -0700539A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
540is used to make it easy to determine where a bug originated, which can help
541review a bug fix. This tag also assists the stable kernel team in determining
542which stable kernel versions should receive your fix. This is the preferred
543method for indicating a bug fixed by the patch. See #2 above for more details.
544
Jonathan Corbetef402032008-03-28 11:22:38 -0600545
54615) The canonical patch format
Randy Dunlap84da7c02005-06-28 20:45:30 -0700547
Paul Jackson75f84262005-10-02 18:01:42 -0700548The canonical patch subject line is:
549
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700550 Subject: [PATCH 001/123] subsystem: summary phrase
Paul Jackson75f84262005-10-02 18:01:42 -0700551
552The canonical patch message body contains the following:
553
554 - A "from" line specifying the patch author.
555
556 - An empty line.
557
558 - The body of the explanation, which will be copied to the
559 permanent changelog to describe this patch.
560
561 - The "Signed-off-by:" lines, described above, which will
562 also go in the changelog.
563
564 - A marker line containing simply "---".
565
566 - Any additional comments not suitable for the changelog.
567
568 - The actual patch (diff output).
569
570The Subject line format makes it very easy to sort the emails
571alphabetically by subject line - pretty much any email reader will
572support that - since because the sequence number is zero-padded,
573the numerical and alphabetic sort is the same.
574
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700575The "subsystem" in the email's Subject should identify which
576area or subsystem of the kernel is being patched.
577
578The "summary phrase" in the email's Subject should concisely
579describe the patch which that email contains. The "summary
580phrase" should not be a filename. Do not use the same "summary
Randy Dunlap66effdc2007-05-09 02:33:42 -0700581phrase" for every patch in a whole patch series (where a "patch
582series" is an ordered sequence of multiple, related patches).
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700583
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400584Bear in mind that the "summary phrase" of your email becomes a
585globally-unique identifier for that patch. It propagates all the way
586into the git changelog. The "summary phrase" may later be used in
587developer discussions which refer to the patch. People will want to
588google for the "summary phrase" to read discussion regarding that
589patch. It will also be the only thing that people may quickly see
590when, two or three months later, they are going through perhaps
591thousands of patches using tools such as "gitk" or "git log
592--oneline".
593
594For these reasons, the "summary" must be no more than 70-75
595characters, and it must describe both what the patch changes, as well
596as why the patch might be necessary. It is challenging to be both
597succinct and descriptive, but that is what a well-written summary
598should do.
599
600The "summary phrase" may be prefixed by tags enclosed in square
601brackets: "Subject: [PATCH tag] <summary phrase>". The tags are not
602considered part of the summary phrase, but describe how the patch
603should be treated. Common tags might include a version descriptor if
604the multiple versions of the patch have been sent out in response to
605comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
606comments. If there are four patches in a patch series the individual
607patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
608that developers understand the order in which the patches should be
609applied and that they have reviewed or applied all of the patches in
610the patch series.
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700611
612A couple of example Subjects:
613
614 Subject: [patch 2/5] ext2: improve scalability of bitmap searching
615 Subject: [PATCHv2 001/207] x86: fix eflags tracking
Paul Jackson75f84262005-10-02 18:01:42 -0700616
617The "from" line must be the very first line in the message body,
618and has the form:
619
620 From: Original Author <author@example.com>
621
622The "from" line specifies who will be credited as the author of the
623patch in the permanent changelog. If the "from" line is missing,
624then the "From:" line from the email header will be used to determine
625the patch author in the changelog.
626
627The explanation body will be committed to the permanent source
628changelog, so should make sense to a competent reader who has long
629since forgotten the immediate details of the discussion that might
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400630have led to this patch. Including symptoms of the failure which the
631patch addresses (kernel log messages, oops messages, etc.) is
632especially useful for people who might be searching the commit logs
633looking for the applicable patch. If a patch fixes a compile failure,
634it may not be necessary to include _all_ of the compile failures; just
635enough that it is likely that someone searching for the patch can find
636it. As in the "summary phrase", it is important to be both succinct as
637well as descriptive.
Paul Jackson75f84262005-10-02 18:01:42 -0700638
639The "---" marker line serves the essential purpose of marking for patch
640handling tools where the changelog message ends.
641
642One good use for the additional comments after the "---" marker is for
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400643a diffstat, to show what files have changed, and the number of
644inserted and deleted lines per file. A diffstat is especially useful
645on bigger patches. Other comments relevant only to the moment or the
646maintainer, not suitable for the permanent changelog, should also go
647here. A good example of such comments might be "patch changelogs"
648which describe what has changed between the v1 and v2 version of the
649patch.
650
651If you are going to include a diffstat after the "---" marker, please
652use diffstat options "-p 1 -w 70" so that filenames are listed from
653the top of the kernel source tree and don't use too much horizontal
Josh Triplett8e3072a2014-04-03 14:48:30 -0700654space (easily fit in 80 columns, maybe with some indentation). (git
655generates appropriate diffstats by default.)
Paul Jackson75f84262005-10-02 18:01:42 -0700656
657See more details on the proper patch format in the following
658references.
659
660
Randy Dunlap14863612008-07-27 20:44:24 -070066116) Sending "git pull" requests (from Linus emails)
Randy Dunlap84da7c02005-06-28 20:45:30 -0700662
Randy Dunlap14863612008-07-27 20:44:24 -0700663Please write the git repo address and branch name alone on the same line
664so that I can't even by mistake pull from the wrong branch, and so
665that a triple-click just selects the whole thing.
666
667So the proper format is something along the lines of:
668
669 "Please pull from
670
671 git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
672
673 to get these changes:"
674
675so that I don't have to hunt-and-peck for the address and inevitably
676get it wrong (actually, I've only gotten it wrong a few times, and
677checking against the diffstat tells me when I get it wrong, but I'm
678just a lot more comfortable when I don't have to "look for" the right
679thing to pull, and double-check that I have the right branch-name).
680
681
682Please use "git diff -M --stat --summary" to generate the diffstat:
683the -M enables rename detection, and the summary enables a summary of
684new/deleted or renamed files.
685
686With rename detection, the statistics are rather different [...]
687because git will notice that a fair number of the changes are renames.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700688
Linus Torvalds1da177e2005-04-16 15:20:36 -0700689-----------------------------------
690SECTION 2 - HINTS, TIPS, AND TRICKS
691-----------------------------------
692
693This section lists many of the common "rules" associated with code
694submitted to the kernel. There are always exceptions... but you must
695have a really good reason for doing so. You could probably call this
696section Linus Computer Science 101.
697
698
699
7001) Read Documentation/CodingStyle
701
702Nuff said. If your code deviates too much from this, it is likely
703to be rejected without further review, and without comment.
704
Keiichi Kii5ab3bd52007-10-26 15:51:44 +0900705One significant exception is when moving code from one file to
706another -- in this case you should not modify the moved code at all in
Andy Whitcroftde7d4f02007-07-15 23:37:22 -0700707the same patch which moves it. This clearly delineates the act of
708moving the code and your changes. This greatly aids review of the
709actual differences and allows tools to better track the history of
710the code itself.
711
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700712Check your patches with the patch style checker prior to submission
Andy Whitcroftde7d4f02007-07-15 23:37:22 -0700713(scripts/checkpatch.pl). The style checker should be viewed as
714a guide not as the final word. If your code looks better with
715a violation then its probably best left alone.
716
717The checker reports at three levels:
718 - ERROR: things that are very likely to be wrong
719 - WARNING: things requiring careful review
720 - CHECK: things requiring thought
721
722You should be able to justify all violations that remain in your
723patch.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700724
Linus Torvalds1da177e2005-04-16 15:20:36 -0700725
726
7272) #ifdefs are ugly
728
729Code cluttered with ifdefs is difficult to read and maintain. Don't do
730it. Instead, put your ifdefs in a header, and conditionally define
731'static inline' functions, or macros, which are used in the code.
732Let the compiler optimize away the "no-op" case.
733
734Simple example, of poor code:
735
736 dev = alloc_etherdev (sizeof(struct funky_private));
737 if (!dev)
738 return -ENODEV;
739 #ifdef CONFIG_NET_FUNKINESS
740 init_funky_net(dev);
741 #endif
742
743Cleaned-up example:
744
745(in header)
746 #ifndef CONFIG_NET_FUNKINESS
747 static inline void init_funky_net (struct net_device *d) {}
748 #endif
749
750(in the code itself)
751 dev = alloc_etherdev (sizeof(struct funky_private));
752 if (!dev)
753 return -ENODEV;
754 init_funky_net(dev);
755
756
757
7583) 'static inline' is better than a macro
759
760Static inline functions are greatly preferred over macros.
761They provide type safety, have no length limitations, no formatting
762limitations, and under gcc they are as cheap as macros.
763
764Macros should only be used for cases where a static inline is clearly
Jim Meyeringf2b2ea62008-04-02 13:04:46 -0700765suboptimal [there are a few, isolated cases of this in fast paths],
Linus Torvalds1da177e2005-04-16 15:20:36 -0700766or where it is impossible to use a static inline function [such as
767string-izing].
768
769'static inline' is preferred over 'static __inline__', 'extern inline',
770and 'extern __inline__'.
771
772
773
7744) Don't over-design.
775
776Don't try to anticipate nebulous future cases which may or may not
Randy Dunlap84da7c02005-06-28 20:45:30 -0700777be useful: "Make it as simple as you can, and no simpler."
Linus Torvalds1da177e2005-04-16 15:20:36 -0700778
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800779
780
781----------------------
782SECTION 3 - REFERENCES
783----------------------
784
785Andrew Morton, "The perfect patch" (tpp).
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700786 <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800787
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700788Jeff Garzik, "Linux kernel patch submission format".
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800789 <http://linux.yyz.us/patch-format.html>
790
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700791Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
Vikram Narayananf5039932011-05-23 12:01:25 -0700792 <http://www.kroah.com/log/linux/maintainer.html>
793 <http://www.kroah.com/log/linux/maintainer-02.html>
794 <http://www.kroah.com/log/linux/maintainer-03.html>
795 <http://www.kroah.com/log/linux/maintainer-04.html>
796 <http://www.kroah.com/log/linux/maintainer-05.html>
Sudip Mukherjee7e0dae62014-09-07 11:26:12 -0700797 <http://www.kroah.com/log/linux/maintainer-06.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800798
Randy Dunlapbc7455f2006-07-30 03:03:45 -0700799NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700800 <https://lkml.org/lkml/2005/7/11/336>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800801
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700802Kernel Documentation/CodingStyle:
Qi Yong4db29c12007-06-12 13:06:49 +0800803 <http://users.sosdg.org/~qiyong/lxr/source/Documentation/CodingStyle>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800804
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700805Linus Torvalds's mail on the canonical patch format:
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800806 <http://lkml.org/lkml/2005/4/7/183>
Andi Kleen95367272008-10-15 22:02:02 -0700807
808Andi Kleen, "On submitting kernel patches"
Lucas De Marchi25985ed2011-03-30 22:57:33 -0300809 Some strategies to get difficult or controversial changes in.
Andi Kleen95367272008-10-15 22:02:02 -0700810 http://halobates.de/on-submitting-patches.pdf
811
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800812--