blob: 9c3dfa7babf3072242962e6a1d662edb0c3f923e [file] [log] [blame]
Mauro Carvalho Chehab609d99a2016-09-19 08:07:56 -03001.. _submittingpatches:
Linus Torvalds1da177e2005-04-16 15:20:36 -07002
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003How to Get Your Change Into the Linux Kernel or Care And Operation Of Your Linus Torvalds
4=========================================================================================
Linus Torvalds1da177e2005-04-16 15:20:36 -07005
6For a person or company who wishes to submit a change to the Linux
7kernel, the process can sometimes be daunting if you're not familiar
8with "the system." This text is a collection of suggestions which
9can greatly increase the chances of your change being accepted.
10
Jonathan Corbetd00c4552014-12-23 08:54:36 -070011This document contains a large number of suggestions in a relatively terse
12format. For detailed information on how the kernel development process
13works, see Documentation/development-process. Also, read
14Documentation/SubmitChecklist for a list of items to check before
15submitting code. If you are submitting a driver, also read
Jonathan Corbet082bd1c2014-12-23 09:27:04 -070016Documentation/SubmittingDrivers; for device tree binding patches, read
17Documentation/devicetree/bindings/submitting-patches.txt.
Linus Torvalds1da177e2005-04-16 15:20:36 -070018
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030019Many of these steps describe the default behavior of the ``git`` version
20control system; if you use ``git`` to prepare your patches, you'll find much
Josh Triplett8e3072a2014-04-03 14:48:30 -070021of the mechanical work done for you, though you'll still need to prepare
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030022and document a sensible set of patches. In general, use of ``git`` will make
Jonathan Corbetd00c4552014-12-23 08:54:36 -070023your life as a kernel developer easier.
Linus Torvalds1da177e2005-04-16 15:20:36 -070024
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030025Creating and Sending your Change
26********************************
Linus Torvalds1da177e2005-04-16 15:20:36 -070027
28
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700290) Obtain a current source tree
30-------------------------------
31
32If you do not have a repository with the current kernel source handy, use
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030033``git`` to obtain one. You'll want to start with the mainline repository,
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030034which can be grabbed with::
Jonathan Corbet7994cc12014-12-23 08:43:41 -070035
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030036 git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Jonathan Corbet7994cc12014-12-23 08:43:41 -070037
38Note, however, that you may not want to develop against the mainline tree
39directly. Most subsystem maintainers run their own trees and want to see
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030040patches prepared against those trees. See the **T:** entry for the subsystem
Jonathan Corbet7994cc12014-12-23 08:43:41 -070041in the MAINTAINERS file to find that tree, or simply ask the maintainer if
42the tree is not listed there.
43
44It is still possible to download kernel releases via tarballs (as described
45in the next section), but that is the hard way to do kernel development.
Linus Torvalds1da177e2005-04-16 15:20:36 -070046
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300471) ``diff -up``
48---------------
Linus Torvalds1da177e2005-04-16 15:20:36 -070049
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030050If you must generate your patches by hand, use ``diff -up`` or ``diff -uprN``
Jonathan Corbet7994cc12014-12-23 08:43:41 -070051to create patches. Git generates patches in this form by default; if
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030052you're using ``git``, you can skip this section entirely.
Linus Torvalds1da177e2005-04-16 15:20:36 -070053
54All changes to the Linux kernel occur in the form of patches, as
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030055generated by :manpage:`diff(1)`. When creating your patch, make sure to
56create it in "unified diff" format, as supplied by the ``-u`` argument
57to :manpage:`diff(1)`.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030058Also, please use the ``-p`` argument which shows which C function each
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030059change is in - that makes the resultant ``diff`` a lot easier to read.
Linus Torvalds1da177e2005-04-16 15:20:36 -070060Patches should be based in the root kernel source directory,
61not in any lower subdirectory.
62
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030063To create a patch for a single file, it is often sufficient to do::
Linus Torvalds1da177e2005-04-16 15:20:36 -070064
Jonathan Corbetd00c4552014-12-23 08:54:36 -070065 SRCTREE= linux
Linus Torvalds1da177e2005-04-16 15:20:36 -070066 MYFILE= drivers/net/mydriver.c
67
68 cd $SRCTREE
69 cp $MYFILE $MYFILE.orig
70 vi $MYFILE # make your change
71 cd ..
72 diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch
73
74To create a patch for multiple files, you should unpack a "vanilla",
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030075or unmodified kernel source tree, and generate a ``diff`` against your
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030076own source tree. For example::
Linus Torvalds1da177e2005-04-16 15:20:36 -070077
Jonathan Corbetd00c4552014-12-23 08:54:36 -070078 MYSRC= /devel/linux
Linus Torvalds1da177e2005-04-16 15:20:36 -070079
Jonathan Corbetd00c4552014-12-23 08:54:36 -070080 tar xvfz linux-3.19.tar.gz
81 mv linux-3.19 linux-3.19-vanilla
82 diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \
83 linux-3.19-vanilla $MYSRC > /tmp/patch
Linus Torvalds1da177e2005-04-16 15:20:36 -070084
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030085``dontdiff`` is a list of files which are generated by the kernel during
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030086the build process, and should be ignored in any :manpage:`diff(1)`-generated
Jonathan Corbetd00c4552014-12-23 08:54:36 -070087patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -070088
89Make sure your patch does not include any extra files which do not
90belong in a patch submission. Make sure to review your patch -after-
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030091generating it with :manpage:`diff(1)`, to ensure accuracy.
Linus Torvalds1da177e2005-04-16 15:20:36 -070092
Josh Triplett8e3072a2014-04-03 14:48:30 -070093If your changes produce a lot of deltas, you need to split them into
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030094individual patches which modify things in logical stages; see
95:ref:`split_changes`. This will facilitate review by other kernel developers,
Josh Triplett8e3072a2014-04-03 14:48:30 -070096very important if you want your patch accepted.
Linus Torvalds1da177e2005-04-16 15:20:36 -070097
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030098If you're using ``git``, ``git rebase -i`` can help you with this process. If
99you're not using ``git``, ``quilt`` <http://savannah.nongnu.org/projects/quilt>
Josh Triplett8e3072a2014-04-03 14:48:30 -0700100is another popular alternative.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700101
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300102.. _describe_changes:
Randy Dunlap84da7c02005-06-28 20:45:30 -0700103
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03001042) Describe your changes
105------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700106
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700107Describe your problem. Whether your patch is a one-line bug fix or
1085000 lines of a new feature, there must be an underlying problem that
109motivated you to do this work. Convince the reviewer that there is a
110problem worth fixing and that it makes sense for them to read past the
111first paragraph.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700112
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700113Describe user-visible impact. Straight up crashes and lockups are
114pretty convincing, but not all bugs are that blatant. Even if the
115problem was spotted during code review, describe the impact you think
116it can have on users. Keep in mind that the majority of Linux
117installations run kernels from secondary stable trees or
118vendor/product-specific trees that cherry-pick only specific patches
119from upstream, so include anything that could help route your change
120downstream: provoking circumstances, excerpts from dmesg, crash
121descriptions, performance regressions, latency spikes, lockups, etc.
122
123Quantify optimizations and trade-offs. If you claim improvements in
124performance, memory consumption, stack footprint, or binary size,
125include numbers that back them up. But also describe non-obvious
126costs. Optimizations usually aren't free but trade-offs between CPU,
127memory, and readability; or, when it comes to heuristics, between
128different workloads. Describe the expected downsides of your
129optimization so that the reviewer can weigh costs against benefits.
130
131Once the problem is established, describe what you are actually doing
132about it in technical detail. It's important to describe the change
133in plain English for the reviewer to verify that the code is behaving
134as you intend it to.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700135
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400136The maintainer will thank you if you write your patch description in a
137form which can be easily pulled into Linux's source code management
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300138system, ``git``, as a "commit log". See :ref:`explicit_in_reply_to`.
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400139
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700140Solve only one problem per patch. If your description starts to get
141long, that's a sign that you probably need to split up your patch.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300142See :ref:`split_changes`.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700143
Randy Dunlapd89b1942010-08-09 17:20:21 -0700144When you submit or resubmit a patch or patch series, include the
145complete patch description and justification for it. Don't just
146say that this is version N of the patch (series). Don't expect the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700147subsystem maintainer to refer back to earlier patch versions or referenced
Randy Dunlapd89b1942010-08-09 17:20:21 -0700148URLs to find the patch description and put that into the patch.
149I.e., the patch (series) and its description should be self-contained.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700150This benefits both the maintainers and reviewers. Some reviewers
Randy Dunlapd89b1942010-08-09 17:20:21 -0700151probably didn't even receive earlier versions of the patch.
152
Josh Triplett74a475a2014-04-03 14:48:28 -0700153Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
154instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
155to do frotz", as if you are giving orders to the codebase to change
156its behaviour.
157
Randy Dunlapd89b1942010-08-09 17:20:21 -0700158If the patch fixes a logged bug entry, refer to that bug entry by
Josh Triplett9547c702014-04-03 14:48:29 -0700159number and URL. If the patch follows from a mailing list discussion,
160give a URL to the mailing list archive; use the https://lkml.kernel.org/
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300161redirector with a ``Message-Id``, to ensure that the links cannot become
Josh Triplett9547c702014-04-03 14:48:29 -0700162stale.
163
164However, try to make your explanation understandable without external
165resources. In addition to giving a URL to a mailing list archive or
166bug, summarize the relevant points of the discussion that led to the
167patch as submitted.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700168
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700169If you want to refer to a specific commit, don't just refer to the
170SHA-1 ID of the commit. Please also include the oneline summary of
171the commit, to make it easier for reviewers to know what it is about.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300172Example::
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700173
174 Commit e21d2170f36602ae2708 ("video: remove unnecessary
175 platform_set_drvdata()") removed the unnecessary
176 platform_set_drvdata(), but left the variable "dev" unused,
177 delete it.
178
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700179You should also be sure to use at least the first twelve characters of the
180SHA-1 ID. The kernel repository holds a *lot* of objects, making
181collisions with shorter IDs a real possibility. Bear in mind that, even if
182there is no collision with your six-character ID now, that condition may
183change five years from now.
184
Jacob Keller8401aa12014-06-06 14:36:39 -0700185If your patch fixes a bug in a specific commit, e.g. you found an issue using
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300186``git bisect``, please use the 'Fixes:' tag with the first 12 characters of
187the SHA-1 ID, and the one line summary. For example::
Jacob Keller8401aa12014-06-06 14:36:39 -0700188
189 Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")
190
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300191The following ``git config`` settings can be used to add a pretty format for
192outputting the above style in the ``git log`` or ``git show`` commands::
Jacob Keller8401aa12014-06-06 14:36:39 -0700193
194 [core]
195 abbrev = 12
196 [pretty]
197 fixes = Fixes: %h (\"%s\")
Linus Torvalds1da177e2005-04-16 15:20:36 -0700198
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300199.. _split_changes:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700200
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03002013) Separate your changes
202------------------------
203
204Separate each **logical change** into a separate patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700205
206For example, if your changes include both bug fixes and performance
207enhancements for a single driver, separate those changes into two
208or more patches. If your changes include an API update, and a new
209driver which uses that new API, separate those into two patches.
210
211On the other hand, if you make a single change to numerous files,
212group those changes into a single patch. Thus a single logical change
213is contained within a single patch.
214
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700215The point to remember is that each patch should make an easily understood
216change that can be verified by reviewers. Each patch should be justifiable
217on its own merits.
218
Linus Torvalds1da177e2005-04-16 15:20:36 -0700219If one patch depends on another patch in order for a change to be
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300220complete, that is OK. Simply note **"this patch depends on patch X"**
Linus Torvalds1da177e2005-04-16 15:20:36 -0700221in your patch description.
222
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700223When dividing your change into a series of patches, take special care to
224ensure that the kernel builds and runs properly after each patch in the
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300225series. Developers using ``git bisect`` to track down a problem can end up
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700226splitting your patch series at any point; they will not thank you if you
227introduce bugs in the middle.
228
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800229If you cannot condense your patch set into a smaller set of patches,
230then only post say 15 or so at a time and wait for review and integration.
231
232
Linus Torvalds1da177e2005-04-16 15:20:36 -0700233
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03002344) Style-check your changes
235---------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700236
237Check your patch for basic style violations, details of which can be
238found in Documentation/CodingStyle. Failure to do so simply wastes
Linus Nilssonf56d35e2007-07-21 17:49:06 +0200239the reviewers time and will get your patch rejected, probably
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700240without even being read.
241
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700242One significant exception is when moving code from one file to
243another -- in this case you should not modify the moved code at all in
244the same patch which moves it. This clearly delineates the act of
245moving the code and your changes. This greatly aids review of the
246actual differences and allows tools to better track the history of
247the code itself.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700248
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700249Check your patches with the patch style checker prior to submission
250(scripts/checkpatch.pl). Note, though, that the style checker should be
251viewed as a guide, not as a replacement for human judgment. If your code
252looks better with a violation then its probably best left alone.
253
254The checker reports at three levels:
255 - ERROR: things that are very likely to be wrong
256 - WARNING: things requiring careful review
257 - CHECK: things requiring thought
258
259You should be able to justify all violations that remain in your
260patch.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700261
262
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03002635) Select the recipients for your patch
264---------------------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700265
Jonathan Corbetccae8612014-12-23 08:49:18 -0700266You should always copy the appropriate subsystem maintainer(s) on any patch
267to code that they maintain; look through the MAINTAINERS file and the
268source code revision history to see who those maintainers are. The
269script scripts/get_maintainer.pl can be very useful at this step. If you
Sébastien Hindererd6eff072015-07-08 21:12:32 +0200270cannot find a maintainer for the subsystem you are working on, Andrew
Jonathan Corbetccae8612014-12-23 08:49:18 -0700271Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700272
Jonathan Corbetccae8612014-12-23 08:49:18 -0700273You should also normally choose at least one mailing list to receive a copy
274of your patch set. linux-kernel@vger.kernel.org functions as a list of
275last resort, but the volume on that list has caused a number of developers
276to tune it out. Look in the MAINTAINERS file for a subsystem-specific
277list; your patch will probably get more attention there. Please do not
278spam unrelated lists, though.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700279
Jonathan Corbetccae8612014-12-23 08:49:18 -0700280Many kernel-related lists are hosted on vger.kernel.org; you can find a
281list of them at http://vger.kernel.org/vger-lists.html. There are
282kernel-related lists hosted elsewhere as well, though.
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800283
284Do not send more than 15 patches at once to the vger mailing lists!!!
285
Linus Torvalds1da177e2005-04-16 15:20:36 -0700286Linus Torvalds is the final arbiter of all changes accepted into the
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800287Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
Jonathan Corbetccae8612014-12-23 08:49:18 -0700288He gets a lot of e-mail, and, at this point, very few patches go through
289Linus directly, so typically you should do your best to -avoid-
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800290sending him e-mail.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700291
Jonathan Corbetccae8612014-12-23 08:49:18 -0700292If you have a patch that fixes an exploitable security bug, send that patch
293to security@kernel.org. For severe bugs, a short embargo may be considered
Nik Nyby253508c2015-06-26 12:05:39 -0400294to allow distributors to get the patch out to users; in such cases,
Jonathan Corbetccae8612014-12-23 08:49:18 -0700295obviously, the patch should not be sent to any public lists.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700296
Jonathan Corbetccae8612014-12-23 08:49:18 -0700297Patches that fix a severe bug in a released kernel should be directed
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300298toward the stable maintainers by putting a line like this::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700299
Jonathan Corbetccae8612014-12-23 08:49:18 -0700300 Cc: stable@vger.kernel.org
Linus Torvalds1da177e2005-04-16 15:20:36 -0700301
Luke Dashjr8cda4c32015-05-14 18:58:01 +0000302into the sign-off area of your patch (note, NOT an email recipient). You
303should also read Documentation/stable_kernel_rules.txt in addition to this
304file.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700305
Jonathan Corbetccae8612014-12-23 08:49:18 -0700306Note, however, that some subsystem maintainers want to come to their own
307conclusions on which patches should go to the stable trees. The networking
308maintainer, in particular, would rather not see individual developers
309adding lines like the above to their patches.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700310
Jonathan Corbetccae8612014-12-23 08:49:18 -0700311If changes affect userland-kernel interfaces, please send the MAN-PAGES
312maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
313least a notification of the change, so that some information makes its way
314into the manual pages. User-space API changes should also be copied to
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300315linux-api@vger.kernel.org.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700316
317For small patches you may want to CC the Trivial Patch Monkey
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200318trivial@kernel.org which collects "trivial" patches. Have a look
319into the MAINTAINERS file for its current manager.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300320
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200321Trivial patches must qualify for one of the following rules:
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300322
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300323- Spelling fixes in documentation
324- Spelling fixes for errors which could break :manpage:`grep(1)`
325- Warning fixes (cluttering with useless warnings is bad)
326- Compilation fixes (only if they are actually correct)
327- Runtime fixes (only if they actually fix things)
328- Removing use of deprecated functions/macros
329- Contact detail and documentation fixes
330- Non-portable code replaced by portable code (even in arch-specific,
331 since people copy, as long as it's trivial)
332- Any fix by the author/maintainer of the file (ie. patch monkey
333 in re-transmission mode)
Randy Dunlap84da7c02005-06-28 20:45:30 -0700334
Linus Torvalds1da177e2005-04-16 15:20:36 -0700335
336
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003376) No MIME, no links, no compression, no attachments. Just plain text
338----------------------------------------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700339
340Linus and other kernel developers need to be able to read and comment
341on the changes you are submitting. It is important for a kernel
342developer to be able to "quote" your changes, using standard e-mail
343tools, so that they may comment on specific portions of your code.
344
Sébastien Hindererbdc89212015-07-12 17:44:15 +0200345For this reason, all patches should be submitted by e-mail "inline".
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300346
347.. warning::
348
349 Be wary of your editor's word-wrap corrupting your patch,
350 if you choose to cut-n-paste your patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700351
352Do not attach the patch as a MIME attachment, compressed or not.
353Many popular e-mail applications will not always transmit a MIME
354attachment as plain text, making it impossible to comment on your
355code. A MIME attachment also takes Linus a bit more time to process,
356decreasing the likelihood of your MIME-attached change being accepted.
357
358Exception: If your mailer is mangling patches then someone may ask
359you to re-send them using MIME.
360
Michael Opdenacker097091c2008-02-03 18:06:58 +0200361See Documentation/email-clients.txt for hints about configuring
362your e-mail client so that it sends your patches untouched.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700363
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003647) E-mail size
365--------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700366
367Large changes are not appropriate for mailing lists, and some
Randy Dunlap4932be72009-10-01 15:44:06 -0700368maintainers. If your patch, uncompressed, exceeds 300 kB in size,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700369it is preferred that you store your patch on an Internet-accessible
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700370server, and provide instead a URL (link) pointing to your patch. But note
371that if your patch exceeds 300 kB, it almost certainly needs to be broken up
372anyway.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700373
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003748) Respond to review comments
375-----------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700376
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700377Your patch will almost certainly get comments from reviewers on ways in
378which the patch can be improved. You must respond to those comments;
379ignoring reviewers is a good way to get ignored in return. Review comments
380or questions that do not lead to a code change should almost certainly
381bring about a comment or changelog entry so that the next reviewer better
382understands what is going on.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700383
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700384Be sure to tell the reviewers what changes you are making and to thank them
385for their time. Code review is a tiring and time-consuming process, and
386reviewers sometimes get grumpy. Even in that case, though, respond
387politely and address the problems they have pointed out.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700388
389
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003909) Don't get discouraged - or impatient
391---------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700392
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700393After you have submitted your change, be patient and wait. Reviewers are
394busy people and may not get to your patch right away.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700395
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700396Once upon a time, patches used to disappear into the void without comment,
397but the development process works more smoothly than that now. You should
398receive comments within a week or so; if that does not happen, make sure
399that you have sent your patches to the right place. Wait for a minimum of
400one week before resubmitting or pinging reviewers - possibly longer during
401busy times like merge windows.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700402
403
Jonathan Corbetccae8612014-12-23 08:49:18 -070040410) Include PATCH in the subject
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700405--------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700406
407Due to high e-mail traffic to Linus, and to linux-kernel, it is common
408convention to prefix your subject line with [PATCH]. This lets Linus
409and other kernel developers more easily distinguish patches from other
410e-mail discussions.
411
412
413
Jonathan Corbetccae8612014-12-23 08:49:18 -070041411) Sign your work
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700415------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700416
417To improve tracking of who did what, especially with patches that can
418percolate to their final resting place in the kernel through several
419layers of maintainers, we've introduced a "sign-off" procedure on
420patches that are being emailed around.
421
422The sign-off is a simple line at the end of the explanation for the
423patch, which certifies that you wrote it or otherwise have the right to
Zac Storerdb12fb82011-08-13 12:34:45 -0700424pass it on as an open-source patch. The rules are pretty simple: if you
Linus Torvalds1da177e2005-04-16 15:20:36 -0700425can certify the below:
426
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300427Developer's Certificate of Origin 1.1
428^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Linus Torvalds1da177e2005-04-16 15:20:36 -0700429
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300430By making a contribution to this project, I certify that:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700431
432 (a) The contribution was created in whole or in part by me and I
433 have the right to submit it under the open source license
434 indicated in the file; or
435
436 (b) The contribution is based upon previous work that, to the best
437 of my knowledge, is covered under an appropriate open source
438 license and I have the right under that license to submit that
439 work with modifications, whether created in whole or in part
440 by me, under the same open source license (unless I am
441 permitted to submit under a different license), as indicated
442 in the file; or
443
444 (c) The contribution was provided directly to me by some other
445 person who certified (a), (b) or (c) and I have not modified
446 it.
447
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800448 (d) I understand and agree that this project and the contribution
449 are public and that a record of the contribution (including all
450 personal information I submit with it, including my sign-off) is
451 maintained indefinitely and may be redistributed consistent with
452 this project or the open source license(s) involved.
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700453
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300454then you just add a line saying::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700455
Alexey Dobriyan9fd55592005-06-25 14:59:34 -0700456 Signed-off-by: Random J Developer <random@developer.example.org>
Linus Torvalds1da177e2005-04-16 15:20:36 -0700457
Greg KHaf45f322006-09-12 20:35:52 -0700458using your real name (sorry, no pseudonyms or anonymous contributions.)
459
Linus Torvalds1da177e2005-04-16 15:20:36 -0700460Some people also put extra tags at the end. They'll just be ignored for
461now, but you can do this to mark internal company procedures or just
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800462point out some special detail about the sign-off.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700463
Willy Tarreauadbd5882008-06-03 00:20:28 +0200464If you are a subsystem or branch maintainer, sometimes you need to slightly
465modify patches you receive in order to merge them, because the code is not
466exactly the same in your tree and the submitters'. If you stick strictly to
467rule (c), you should ask the submitter to rediff, but this is a totally
468counter-productive waste of time and energy. Rule (b) allows you to adjust
469the code, but then it is very impolite to change one submitter's code and
470make him endorse your bugs. To solve this problem, it is recommended that
471you add a line between the last Signed-off-by header and yours, indicating
472the nature of your changes. While there is nothing mandatory about this, it
473seems like prepending the description with your mail and/or name, all
474enclosed in square brackets, is noticeable enough to make it obvious that
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300475you are responsible for last-minute changes. Example::
Willy Tarreauadbd5882008-06-03 00:20:28 +0200476
477 Signed-off-by: Random J Developer <random@developer.example.org>
478 [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
479 Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
480
Jeremiah Mahler305af082014-05-22 00:04:26 -0700481This practice is particularly helpful if you maintain a stable branch and
Willy Tarreauadbd5882008-06-03 00:20:28 +0200482want at the same time to credit the author, track changes, merge the fix,
483and protect the submitter from complaints. Note that under no circumstances
484can you change the author's identity (the From header), as it is the one
485which appears in the changelog.
486
Jeremiah Mahler305af082014-05-22 00:04:26 -0700487Special note to back-porters: It seems to be a common and useful practice
Willy Tarreauadbd5882008-06-03 00:20:28 +0200488to insert an indication of the origin of a patch at the top of the commit
489message (just after the subject line) to facilitate tracking. For instance,
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300490here's what we see in a 3.x-stable release::
Willy Tarreauadbd5882008-06-03 00:20:28 +0200491
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300492 Date: Tue Oct 7 07:26:38 2014 -0400
Willy Tarreauadbd5882008-06-03 00:20:28 +0200493
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700494 libata: Un-break ATA blacklist
Willy Tarreauadbd5882008-06-03 00:20:28 +0200495
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700496 commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
Willy Tarreauadbd5882008-06-03 00:20:28 +0200497
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300498And here's what might appear in an older kernel once a patch is backported::
Willy Tarreauadbd5882008-06-03 00:20:28 +0200499
500 Date: Tue May 13 22:12:27 2008 +0200
501
502 wireless, airo: waitbusy() won't delay
503
504 [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
505
506Whatever the format, this information provides a valuable help to people
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700507tracking your trees, and to people trying to troubleshoot bugs in your
Willy Tarreauadbd5882008-06-03 00:20:28 +0200508tree.
509
Linus Torvalds1da177e2005-04-16 15:20:36 -0700510
Jonathan Corbetccae8612014-12-23 08:49:18 -070051112) When to use Acked-by: and Cc:
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700512---------------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700513
Andrew Morton0f44cd22007-06-08 13:46:45 -0700514The Signed-off-by: tag indicates that the signer was involved in the
515development of the patch, or that he/she was in the patch's delivery path.
516
517If a person was not directly involved in the preparation or handling of a
518patch but wishes to signify and record their approval of it then they can
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700519ask to have an Acked-by: line added to the patch's changelog.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700520
521Acked-by: is often used by the maintainer of the affected code when that
522maintainer neither contributed to nor forwarded the patch.
523
524Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
525has at least reviewed the patch and has indicated acceptance. Hence patch
526mergers will sometimes manually convert an acker's "yep, looks good to me"
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700527into an Acked-by: (but note that it is usually better to ask for an
528explicit ack).
Andrew Morton0f44cd22007-06-08 13:46:45 -0700529
530Acked-by: does not necessarily indicate acknowledgement of the entire patch.
531For example, if a patch affects multiple subsystems and has an Acked-by: from
532one subsystem maintainer then this usually indicates acknowledgement of just
533the part which affects that maintainer's code. Judgement should be used here.
Jonathan Corbetef402032008-03-28 11:22:38 -0600534When in doubt people should refer to the original discussion in the mailing
Andrew Morton0f44cd22007-06-08 13:46:45 -0700535list archives.
536
Jonathan Corbetef402032008-03-28 11:22:38 -0600537If a person has had the opportunity to comment on a patch, but has not
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300538provided such comments, you may optionally add a ``Cc:`` tag to the patch.
Jonathan Corbetef402032008-03-28 11:22:38 -0600539This is the only tag which might be added without an explicit action by the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700540person it names - but it should indicate that this person was copied on the
541patch. This tag documents that potentially interested parties
542have been included in the discussion.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700543
Jonathan Corbetef402032008-03-28 11:22:38 -0600544
Jonathan Corbetccae8612014-12-23 08:49:18 -070054513) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700546--------------------------------------------------------------------------
Jonathan Corbetbbb0a4242009-01-16 09:49:50 -0700547
Dan Carpenterd75ef702014-10-29 13:01:36 +0300548The Reported-by tag gives credit to people who find bugs and report them and it
549hopefully inspires them to help us again in the future. Please note that if
550the bug was reported in private, then ask for permission first before using the
551Reported-by tag.
Jonathan Corbetef402032008-03-28 11:22:38 -0600552
553A Tested-by: tag indicates that the patch has been successfully tested (in
554some environment) by the person named. This tag informs maintainers that
555some testing has been performed, provides a means to locate testers for
556future patches, and ensures credit for the testers.
557
558Reviewed-by:, instead, indicates that the patch has been reviewed and found
559acceptable according to the Reviewer's Statement:
560
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300561Reviewer's statement of oversight
562^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jonathan Corbetef402032008-03-28 11:22:38 -0600563
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300564By offering my Reviewed-by: tag, I state that:
Jonathan Corbetef402032008-03-28 11:22:38 -0600565
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300566 (a) I have carried out a technical review of this patch to
Jonathan Corbetef402032008-03-28 11:22:38 -0600567 evaluate its appropriateness and readiness for inclusion into
568 the mainline kernel.
569
570 (b) Any problems, concerns, or questions relating to the patch
571 have been communicated back to the submitter. I am satisfied
572 with the submitter's response to my comments.
573
574 (c) While there may be things that could be improved with this
575 submission, I believe that it is, at this time, (1) a
576 worthwhile modification to the kernel, and (2) free of known
577 issues which would argue against its inclusion.
578
579 (d) While I have reviewed the patch and believe it to be sound, I
580 do not (unless explicitly stated elsewhere) make any
581 warranties or guarantees that it will achieve its stated
582 purpose or function properly in any given situation.
583
584A Reviewed-by tag is a statement of opinion that the patch is an
585appropriate modification of the kernel without any remaining serious
586technical issues. Any interested reviewer (who has done the work) can
587offer a Reviewed-by tag for a patch. This tag serves to give credit to
588reviewers and to inform maintainers of the degree of review which has been
589done on the patch. Reviewed-by: tags, when supplied by reviewers known to
590understand the subject area and to perform thorough reviews, will normally
Pavel Machek5801da12009-06-04 16:26:50 +0200591increase the likelihood of your patch getting into the kernel.
Jonathan Corbetef402032008-03-28 11:22:38 -0600592
Mugunthan V N8543ae12013-04-29 16:18:17 -0700593A Suggested-by: tag indicates that the patch idea is suggested by the person
594named and ensures credit to the person for the idea. Please note that this
595tag should not be added without the reporter's permission, especially if the
596idea was not posted in a public forum. That said, if we diligently credit our
597idea reporters, they will, hopefully, be inspired to help us again in the
598future.
599
Jacob Keller8401aa12014-06-06 14:36:39 -0700600A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
601is used to make it easy to determine where a bug originated, which can help
602review a bug fix. This tag also assists the stable kernel team in determining
603which stable kernel versions should receive your fix. This is the preferred
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300604method for indicating a bug fixed by the patch. See :ref:`describe_changes`
605for more details.
Jacob Keller8401aa12014-06-06 14:36:39 -0700606
Jonathan Corbetef402032008-03-28 11:22:38 -0600607
Jonathan Corbetccae8612014-12-23 08:49:18 -070060814) The canonical patch format
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700609------------------------------
610
611This section describes how the patch itself should be formatted. Note
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300612that, if you have your patches stored in a ``git`` repository, proper patch
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300613formatting can be had with ``git format-patch``. The tools cannot create
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700614the necessary text, though, so read the instructions below anyway.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700615
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300616The canonical patch subject line is::
Paul Jackson75f84262005-10-02 18:01:42 -0700617
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700618 Subject: [PATCH 001/123] subsystem: summary phrase
Paul Jackson75f84262005-10-02 18:01:42 -0700619
620The canonical patch message body contains the following:
621
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300622 - A ``from`` line specifying the patch author (only needed if the person
Jonathan Corbetccae8612014-12-23 08:49:18 -0700623 sending the patch is not the author).
Paul Jackson75f84262005-10-02 18:01:42 -0700624
625 - An empty line.
626
Joe Perches2a076f42015-04-16 12:44:28 -0700627 - The body of the explanation, line wrapped at 75 columns, which will
628 be copied to the permanent changelog to describe this patch.
Paul Jackson75f84262005-10-02 18:01:42 -0700629
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300630 - The ``Signed-off-by:`` lines, described above, which will
Paul Jackson75f84262005-10-02 18:01:42 -0700631 also go in the changelog.
632
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300633 - A marker line containing simply ``---``.
Paul Jackson75f84262005-10-02 18:01:42 -0700634
635 - Any additional comments not suitable for the changelog.
636
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300637 - The actual patch (``diff`` output).
Paul Jackson75f84262005-10-02 18:01:42 -0700638
639The Subject line format makes it very easy to sort the emails
640alphabetically by subject line - pretty much any email reader will
641support that - since because the sequence number is zero-padded,
642the numerical and alphabetic sort is the same.
643
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300644The ``subsystem`` in the email's Subject should identify which
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700645area or subsystem of the kernel is being patched.
646
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300647The ``summary phrase`` in the email's Subject should concisely
648describe the patch which that email contains. The ``summary
649phrase`` should not be a filename. Do not use the same ``summary
650phrase`` for every patch in a whole patch series (where a ``patch
651series`` is an ordered sequence of multiple, related patches).
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700652
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300653Bear in mind that the ``summary phrase`` of your email becomes a
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400654globally-unique identifier for that patch. It propagates all the way
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300655into the ``git`` changelog. The ``summary phrase`` may later be used in
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400656developer discussions which refer to the patch. People will want to
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300657google for the ``summary phrase`` to read discussion regarding that
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400658patch. It will also be the only thing that people may quickly see
659when, two or three months later, they are going through perhaps
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300660thousands of patches using tools such as ``gitk`` or ``git log
661--oneline``.
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400662
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300663For these reasons, the ``summary`` must be no more than 70-75
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400664characters, and it must describe both what the patch changes, as well
665as why the patch might be necessary. It is challenging to be both
666succinct and descriptive, but that is what a well-written summary
667should do.
668
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300669The ``summary phrase`` may be prefixed by tags enclosed in square
Alex Henriee12d7462015-09-20 14:11:19 +0200670brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are
671not considered part of the summary phrase, but describe how the patch
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400672should be treated. Common tags might include a version descriptor if
673the multiple versions of the patch have been sent out in response to
674comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
675comments. If there are four patches in a patch series the individual
676patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
677that developers understand the order in which the patches should be
678applied and that they have reviewed or applied all of the patches in
679the patch series.
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700680
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300681A couple of example Subjects::
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700682
Alex Henriee12d7462015-09-20 14:11:19 +0200683 Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
684 Subject: [PATCH v2 01/27] x86: fix eflags tracking
Paul Jackson75f84262005-10-02 18:01:42 -0700685
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300686The ``from`` line must be the very first line in the message body,
Paul Jackson75f84262005-10-02 18:01:42 -0700687and has the form:
688
689 From: Original Author <author@example.com>
690
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300691The ``from`` line specifies who will be credited as the author of the
692patch in the permanent changelog. If the ``from`` line is missing,
693then the ``From:`` line from the email header will be used to determine
Paul Jackson75f84262005-10-02 18:01:42 -0700694the patch author in the changelog.
695
696The explanation body will be committed to the permanent source
697changelog, so should make sense to a competent reader who has long
698since forgotten the immediate details of the discussion that might
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400699have led to this patch. Including symptoms of the failure which the
700patch addresses (kernel log messages, oops messages, etc.) is
701especially useful for people who might be searching the commit logs
702looking for the applicable patch. If a patch fixes a compile failure,
703it may not be necessary to include _all_ of the compile failures; just
704enough that it is likely that someone searching for the patch can find
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300705it. As in the ``summary phrase``, it is important to be both succinct as
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400706well as descriptive.
Paul Jackson75f84262005-10-02 18:01:42 -0700707
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300708The ``---`` marker line serves the essential purpose of marking for patch
Paul Jackson75f84262005-10-02 18:01:42 -0700709handling tools where the changelog message ends.
710
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300711One good use for the additional comments after the ``---`` marker is for
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300712a ``diffstat``, to show what files have changed, and the number of
713inserted and deleted lines per file. A ``diffstat`` is especially useful
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400714on bigger patches. Other comments relevant only to the moment or the
715maintainer, not suitable for the permanent changelog, should also go
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300716here. A good example of such comments might be ``patch changelogs``
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400717which describe what has changed between the v1 and v2 version of the
718patch.
719
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300720If you are going to include a ``diffstat`` after the ``---`` marker, please
721use ``diffstat`` options ``-p 1 -w 70`` so that filenames are listed from
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400722the top of the kernel source tree and don't use too much horizontal
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300723space (easily fit in 80 columns, maybe with some indentation). (``git``
Josh Triplett8e3072a2014-04-03 14:48:30 -0700724generates appropriate diffstats by default.)
Paul Jackson75f84262005-10-02 18:01:42 -0700725
726See more details on the proper patch format in the following
727references.
728
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300729.. _explicit_in_reply_to:
730
Chris Metcalfd7ac8d82015-11-05 15:21:47 -050073115) Explicit In-Reply-To headers
732--------------------------------
Paul Jackson75f84262005-10-02 18:01:42 -0700733
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500734It can be helpful to manually add In-Reply-To: headers to a patch
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300735(e.g., when using ``git send-email``) to associate the patch with
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500736previous relevant discussion, e.g. to link a bug fix to the email with
737the bug report. However, for a multi-patch series, it is generally
738best to avoid using In-Reply-To: to link to older versions of the
739series. This way multiple versions of the patch don't become an
740unmanageable forest of references in email clients. If a link is
741helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in
742the cover email text) to link to an earlier version of the patch series.
743
744
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030074516) Sending ``git pull`` requests
746---------------------------------
Randy Dunlap84da7c02005-06-28 20:45:30 -0700747
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700748If you have a series of patches, it may be most convenient to have the
749maintainer pull them directly into the subsystem repository with a
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300750``git pull`` operation. Note, however, that pulling patches from a developer
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700751requires a higher degree of trust than taking patches from a mailing list.
752As a result, many subsystem maintainers are reluctant to take pull
Jonathan Corbetb792ffe2014-12-23 09:28:40 -0700753requests, especially from new, unknown developers. If in doubt you can use
754the pull request as the cover letter for a normal posting of the patch
755series, giving the maintainer the option of using either.
Randy Dunlap14863612008-07-27 20:44:24 -0700756
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700757A pull request should have [GIT] or [PULL] in the subject line. The
758request itself should include the repository name and the branch of
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300759interest on a single line; it should look something like::
Randy Dunlap14863612008-07-27 20:44:24 -0700760
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700761 Please pull from
Randy Dunlap14863612008-07-27 20:44:24 -0700762
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700763 git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
Randy Dunlap14863612008-07-27 20:44:24 -0700764
Jakub Wilk64e32892015-07-27 10:15:18 +0200765 to get these changes:
Randy Dunlap14863612008-07-27 20:44:24 -0700766
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700767A pull request should also include an overall message saying what will be
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300768included in the request, a ``git shortlog`` listing of the patches
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300769themselves, and a ``diffstat`` showing the overall effect of the patch series.
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700770The easiest way to get all this information together is, of course, to let
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300771``git`` do it for you with the ``git request-pull`` command.
Randy Dunlap14863612008-07-27 20:44:24 -0700772
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700773Some maintainers (including Linus) want to see pull requests from signed
774commits; that increases their confidence that the request actually came
775from you. Linus, in particular, will not pull from public hosting sites
776like GitHub in the absence of a signed tag.
Randy Dunlap14863612008-07-27 20:44:24 -0700777
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700778The first step toward creating such tags is to make a GNUPG key and get it
779signed by one or more core kernel developers. This step can be hard for
780new developers, but there is no way around it. Attending conferences can
781be a good way to find developers who can sign your key.
Randy Dunlap14863612008-07-27 20:44:24 -0700782
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300783Once you have prepared a patch series in ``git`` that you wish to have somebody
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300784pull, create a signed tag with ``git tag -s``. This will create a new tag
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700785identifying the last commit in the series and containing a signature
786created with your private key. You will also have the opportunity to add a
787changelog-style message to the tag; this is an ideal place to describe the
788effects of the pull request as a whole.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700789
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700790If the tree the maintainer will be pulling from is not the repository you
791are working from, don't forget to push the signed tag explicitly to the
792public tree.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700793
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700794When generating your pull request, use the signed tag as the target. A
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300795command like this will do the trick::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700796
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700797 git request-pull master git://my.public.tree/linux.git my-signed-tag
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800798
799
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300800REFERENCES
801**********
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800802
803Andrew Morton, "The perfect patch" (tpp).
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700804 <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800805
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700806Jeff Garzik, "Linux kernel patch submission format".
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800807 <http://linux.yyz.us/patch-format.html>
808
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700809Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
Vikram Narayananf5039932011-05-23 12:01:25 -0700810 <http://www.kroah.com/log/linux/maintainer.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300811
Vikram Narayananf5039932011-05-23 12:01:25 -0700812 <http://www.kroah.com/log/linux/maintainer-02.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300813
Vikram Narayananf5039932011-05-23 12:01:25 -0700814 <http://www.kroah.com/log/linux/maintainer-03.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300815
Vikram Narayananf5039932011-05-23 12:01:25 -0700816 <http://www.kroah.com/log/linux/maintainer-04.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300817
Vikram Narayananf5039932011-05-23 12:01:25 -0700818 <http://www.kroah.com/log/linux/maintainer-05.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300819
Sudip Mukherjee7e0dae62014-09-07 11:26:12 -0700820 <http://www.kroah.com/log/linux/maintainer-06.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800821
Randy Dunlapbc7455f2006-07-30 03:03:45 -0700822NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700823 <https://lkml.org/lkml/2005/7/11/336>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800824
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700825Kernel Documentation/CodingStyle:
Luis de Bethencourt60498bb2015-07-03 16:22:11 +0100826 <Documentation/CodingStyle>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800827
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700828Linus Torvalds's mail on the canonical patch format:
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800829 <http://lkml.org/lkml/2005/4/7/183>
Andi Kleen95367272008-10-15 22:02:02 -0700830
831Andi Kleen, "On submitting kernel patches"
Lucas De Marchi25985ed2011-03-30 22:57:33 -0300832 Some strategies to get difficult or controversial changes in.
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300833
Andi Kleen95367272008-10-15 22:02:02 -0700834 http://halobates.de/on-submitting-patches.pdf
835