blob: 04a4284d8ee48654a659729dbf603469dfca2887 [file] [log] [blame]
Linus Torvalds1da177e2005-04-16 15:20:36 -07001
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03002How to Get Your Change Into the Linux Kernel or Care And Operation Of Your Linus Torvalds
3=========================================================================================
Linus Torvalds1da177e2005-04-16 15:20:36 -07004
5For a person or company who wishes to submit a change to the Linux
6kernel, the process can sometimes be daunting if you're not familiar
7with "the system." This text is a collection of suggestions which
8can greatly increase the chances of your change being accepted.
9
Jonathan Corbetd00c4552014-12-23 08:54:36 -070010This document contains a large number of suggestions in a relatively terse
11format. For detailed information on how the kernel development process
12works, see Documentation/development-process. Also, read
13Documentation/SubmitChecklist for a list of items to check before
14submitting code. If you are submitting a driver, also read
Jonathan Corbet082bd1c2014-12-23 09:27:04 -070015Documentation/SubmittingDrivers; for device tree binding patches, read
16Documentation/devicetree/bindings/submitting-patches.txt.
Linus Torvalds1da177e2005-04-16 15:20:36 -070017
Josh Triplett8e3072a2014-04-03 14:48:30 -070018Many of these steps describe the default behavior of the git version
19control system; if you use git to prepare your patches, you'll find much
20of the mechanical work done for you, though you'll still need to prepare
Jonathan Corbetd00c4552014-12-23 08:54:36 -070021and document a sensible set of patches. In general, use of git will make
22your life as a kernel developer easier.
Linus Torvalds1da177e2005-04-16 15:20:36 -070023
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030024Creating and Sending your Change
25********************************
Linus Torvalds1da177e2005-04-16 15:20:36 -070026
27
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700280) Obtain a current source tree
29-------------------------------
30
31If you do not have a repository with the current kernel source handy, use
32git to obtain one. You'll want to start with the mainline repository,
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030033which can be grabbed with::
Jonathan Corbet7994cc12014-12-23 08:43:41 -070034
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030035 git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Jonathan Corbet7994cc12014-12-23 08:43:41 -070036
37Note, however, that you may not want to develop against the mainline tree
38directly. Most subsystem maintainers run their own trees and want to see
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030039patches prepared against those trees. See the **T:** entry for the subsystem
Jonathan Corbet7994cc12014-12-23 08:43:41 -070040in the MAINTAINERS file to find that tree, or simply ask the maintainer if
41the tree is not listed there.
42
43It is still possible to download kernel releases via tarballs (as described
44in the next section), but that is the hard way to do kernel development.
Linus Torvalds1da177e2005-04-16 15:20:36 -070045
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300461) ``diff -up``
47---------------
Linus Torvalds1da177e2005-04-16 15:20:36 -070048
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030049If you must generate your patches by hand, use ``diff -up`` or ``diff -uprN``
Jonathan Corbet7994cc12014-12-23 08:43:41 -070050to create patches. Git generates patches in this form by default; if
51you're using git, you can skip this section entirely.
Linus Torvalds1da177e2005-04-16 15:20:36 -070052
53All changes to the Linux kernel occur in the form of patches, as
54generated by diff(1). When creating your patch, make sure to create it
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030055in "unified diff" format, as supplied by the ``-u`` argument to diff(1).
56Also, please use the ``-p`` argument which shows which C function each
Linus Torvalds1da177e2005-04-16 15:20:36 -070057change is in - that makes the resultant diff a lot easier to read.
58Patches should be based in the root kernel source directory,
59not in any lower subdirectory.
60
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030061To create a patch for a single file, it is often sufficient to do::
Linus Torvalds1da177e2005-04-16 15:20:36 -070062
Jonathan Corbetd00c4552014-12-23 08:54:36 -070063 SRCTREE= linux
Linus Torvalds1da177e2005-04-16 15:20:36 -070064 MYFILE= drivers/net/mydriver.c
65
66 cd $SRCTREE
67 cp $MYFILE $MYFILE.orig
68 vi $MYFILE # make your change
69 cd ..
70 diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch
71
72To create a patch for multiple files, you should unpack a "vanilla",
73or unmodified kernel source tree, and generate a diff against your
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030074own source tree. For example::
Linus Torvalds1da177e2005-04-16 15:20:36 -070075
Jonathan Corbetd00c4552014-12-23 08:54:36 -070076 MYSRC= /devel/linux
Linus Torvalds1da177e2005-04-16 15:20:36 -070077
Jonathan Corbetd00c4552014-12-23 08:54:36 -070078 tar xvfz linux-3.19.tar.gz
79 mv linux-3.19 linux-3.19-vanilla
80 diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \
81 linux-3.19-vanilla $MYSRC > /tmp/patch
Linus Torvalds1da177e2005-04-16 15:20:36 -070082
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030083``dontdiff`` is a list of files which are generated by the kernel during
Linus Torvalds1da177e2005-04-16 15:20:36 -070084the build process, and should be ignored in any diff(1)-generated
Jonathan Corbetd00c4552014-12-23 08:54:36 -070085patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -070086
87Make sure your patch does not include any extra files which do not
88belong in a patch submission. Make sure to review your patch -after-
Benjamin Herr013542c2015-07-18 14:31:40 +020089generating it with diff(1), to ensure accuracy.
Linus Torvalds1da177e2005-04-16 15:20:36 -070090
Josh Triplett8e3072a2014-04-03 14:48:30 -070091If your changes produce a lot of deltas, you need to split them into
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030092individual patches which modify things in logical stages; see
93:ref:`split_changes`. This will facilitate review by other kernel developers,
Josh Triplett8e3072a2014-04-03 14:48:30 -070094very important if you want your patch accepted.
Linus Torvalds1da177e2005-04-16 15:20:36 -070095
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030096If you're using git, ``git rebase -i`` can help you with this process. If
Josh Triplett8e3072a2014-04-03 14:48:30 -070097you're not using git, quilt <http://savannah.nongnu.org/projects/quilt>
98is another popular alternative.
Randy Dunlap84da7c02005-06-28 20:45:30 -070099
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300100.. _describe_changes:
Randy Dunlap84da7c02005-06-28 20:45:30 -0700101
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03001022) Describe your changes
103------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700104
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700105Describe your problem. Whether your patch is a one-line bug fix or
1065000 lines of a new feature, there must be an underlying problem that
107motivated you to do this work. Convince the reviewer that there is a
108problem worth fixing and that it makes sense for them to read past the
109first paragraph.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700110
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700111Describe user-visible impact. Straight up crashes and lockups are
112pretty convincing, but not all bugs are that blatant. Even if the
113problem was spotted during code review, describe the impact you think
114it can have on users. Keep in mind that the majority of Linux
115installations run kernels from secondary stable trees or
116vendor/product-specific trees that cherry-pick only specific patches
117from upstream, so include anything that could help route your change
118downstream: provoking circumstances, excerpts from dmesg, crash
119descriptions, performance regressions, latency spikes, lockups, etc.
120
121Quantify optimizations and trade-offs. If you claim improvements in
122performance, memory consumption, stack footprint, or binary size,
123include numbers that back them up. But also describe non-obvious
124costs. Optimizations usually aren't free but trade-offs between CPU,
125memory, and readability; or, when it comes to heuristics, between
126different workloads. Describe the expected downsides of your
127optimization so that the reviewer can weigh costs against benefits.
128
129Once the problem is established, describe what you are actually doing
130about it in technical detail. It's important to describe the change
131in plain English for the reviewer to verify that the code is behaving
132as you intend it to.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700133
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400134The maintainer will thank you if you write your patch description in a
135form which can be easily pulled into Linux's source code management
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300136system, git, as a "commit log". See :ref:`explicit_in_reply_to`.
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400137
Johannes Weiner7b9828d2014-08-05 23:32:56 -0700138Solve only one problem per patch. If your description starts to get
139long, that's a sign that you probably need to split up your patch.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300140See :ref:`split_changes`.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700141
Randy Dunlapd89b1942010-08-09 17:20:21 -0700142When you submit or resubmit a patch or patch series, include the
143complete patch description and justification for it. Don't just
144say that this is version N of the patch (series). Don't expect the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700145subsystem maintainer to refer back to earlier patch versions or referenced
Randy Dunlapd89b1942010-08-09 17:20:21 -0700146URLs to find the patch description and put that into the patch.
147I.e., the patch (series) and its description should be self-contained.
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700148This benefits both the maintainers and reviewers. Some reviewers
Randy Dunlapd89b1942010-08-09 17:20:21 -0700149probably didn't even receive earlier versions of the patch.
150
Josh Triplett74a475a2014-04-03 14:48:28 -0700151Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
152instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
153to do frotz", as if you are giving orders to the codebase to change
154its behaviour.
155
Randy Dunlapd89b1942010-08-09 17:20:21 -0700156If the patch fixes a logged bug entry, refer to that bug entry by
Josh Triplett9547c702014-04-03 14:48:29 -0700157number and URL. If the patch follows from a mailing list discussion,
158give a URL to the mailing list archive; use the https://lkml.kernel.org/
159redirector with a Message-Id, to ensure that the links cannot become
160stale.
161
162However, try to make your explanation understandable without external
163resources. In addition to giving a URL to a mailing list archive or
164bug, summarize the relevant points of the discussion that led to the
165patch as submitted.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700166
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700167If you want to refer to a specific commit, don't just refer to the
168SHA-1 ID of the commit. Please also include the oneline summary of
169the commit, to make it easier for reviewers to know what it is about.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300170Example::
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700171
172 Commit e21d2170f36602ae2708 ("video: remove unnecessary
173 platform_set_drvdata()") removed the unnecessary
174 platform_set_drvdata(), but left the variable "dev" unused,
175 delete it.
176
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700177You should also be sure to use at least the first twelve characters of the
178SHA-1 ID. The kernel repository holds a *lot* of objects, making
179collisions with shorter IDs a real possibility. Bear in mind that, even if
180there is no collision with your six-character ID now, that condition may
181change five years from now.
182
Jacob Keller8401aa12014-06-06 14:36:39 -0700183If your patch fixes a bug in a specific commit, e.g. you found an issue using
184git-bisect, please use the 'Fixes:' tag with the first 12 characters of the
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300185SHA-1 ID, and the one line summary. For example::
Jacob Keller8401aa12014-06-06 14:36:39 -0700186
187 Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")
188
189The following git-config settings can be used to add a pretty format for
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300190outputting the above style in the git log or git show commands::
Jacob Keller8401aa12014-06-06 14:36:39 -0700191
192 [core]
193 abbrev = 12
194 [pretty]
195 fixes = Fixes: %h (\"%s\")
Linus Torvalds1da177e2005-04-16 15:20:36 -0700196
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300197.. _split_changes:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700198
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03001993) Separate your changes
200------------------------
201
202Separate each **logical change** into a separate patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700203
204For example, if your changes include both bug fixes and performance
205enhancements for a single driver, separate those changes into two
206or more patches. If your changes include an API update, and a new
207driver which uses that new API, separate those into two patches.
208
209On the other hand, if you make a single change to numerous files,
210group those changes into a single patch. Thus a single logical change
211is contained within a single patch.
212
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700213The point to remember is that each patch should make an easily understood
214change that can be verified by reviewers. Each patch should be justifiable
215on its own merits.
216
Linus Torvalds1da177e2005-04-16 15:20:36 -0700217If one patch depends on another patch in order for a change to be
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300218complete, that is OK. Simply note **"this patch depends on patch X"**
Linus Torvalds1da177e2005-04-16 15:20:36 -0700219in your patch description.
220
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700221When dividing your change into a series of patches, take special care to
222ensure that the kernel builds and runs properly after each patch in the
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300223series. Developers using ``git bisect`` to track down a problem can end up
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700224splitting your patch series at any point; they will not thank you if you
225introduce bugs in the middle.
226
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800227If you cannot condense your patch set into a smaller set of patches,
228then only post say 15 or so at a time and wait for review and integration.
229
230
Linus Torvalds1da177e2005-04-16 15:20:36 -0700231
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03002324) Style-check your changes
233---------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700234
235Check your patch for basic style violations, details of which can be
236found in Documentation/CodingStyle. Failure to do so simply wastes
Linus Nilssonf56d35e2007-07-21 17:49:06 +0200237the reviewers time and will get your patch rejected, probably
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700238without even being read.
239
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700240One significant exception is when moving code from one file to
241another -- in this case you should not modify the moved code at all in
242the same patch which moves it. This clearly delineates the act of
243moving the code and your changes. This greatly aids review of the
244actual differences and allows tools to better track the history of
245the code itself.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700246
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700247Check your patches with the patch style checker prior to submission
248(scripts/checkpatch.pl). Note, though, that the style checker should be
249viewed as a guide, not as a replacement for human judgment. If your code
250looks better with a violation then its probably best left alone.
251
252The checker reports at three levels:
253 - ERROR: things that are very likely to be wrong
254 - WARNING: things requiring careful review
255 - CHECK: things requiring thought
256
257You should be able to justify all violations that remain in your
258patch.
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700259
260
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03002615) Select the recipients for your patch
262---------------------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700263
Jonathan Corbetccae8612014-12-23 08:49:18 -0700264You should always copy the appropriate subsystem maintainer(s) on any patch
265to code that they maintain; look through the MAINTAINERS file and the
266source code revision history to see who those maintainers are. The
267script scripts/get_maintainer.pl can be very useful at this step. If you
Sébastien Hindererd6eff072015-07-08 21:12:32 +0200268cannot find a maintainer for the subsystem you are working on, Andrew
Jonathan Corbetccae8612014-12-23 08:49:18 -0700269Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700270
Jonathan Corbetccae8612014-12-23 08:49:18 -0700271You should also normally choose at least one mailing list to receive a copy
272of your patch set. linux-kernel@vger.kernel.org functions as a list of
273last resort, but the volume on that list has caused a number of developers
274to tune it out. Look in the MAINTAINERS file for a subsystem-specific
275list; your patch will probably get more attention there. Please do not
276spam unrelated lists, though.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700277
Jonathan Corbetccae8612014-12-23 08:49:18 -0700278Many kernel-related lists are hosted on vger.kernel.org; you can find a
279list of them at http://vger.kernel.org/vger-lists.html. There are
280kernel-related lists hosted elsewhere as well, though.
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800281
282Do not send more than 15 patches at once to the vger mailing lists!!!
283
Linus Torvalds1da177e2005-04-16 15:20:36 -0700284Linus Torvalds is the final arbiter of all changes accepted into the
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800285Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
Jonathan Corbetccae8612014-12-23 08:49:18 -0700286He gets a lot of e-mail, and, at this point, very few patches go through
287Linus directly, so typically you should do your best to -avoid-
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800288sending him e-mail.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700289
Jonathan Corbetccae8612014-12-23 08:49:18 -0700290If you have a patch that fixes an exploitable security bug, send that patch
291to security@kernel.org. For severe bugs, a short embargo may be considered
Nik Nyby253508c2015-06-26 12:05:39 -0400292to allow distributors to get the patch out to users; in such cases,
Jonathan Corbetccae8612014-12-23 08:49:18 -0700293obviously, the patch should not be sent to any public lists.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700294
Jonathan Corbetccae8612014-12-23 08:49:18 -0700295Patches that fix a severe bug in a released kernel should be directed
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300296toward the stable maintainers by putting a line like this::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700297
Jonathan Corbetccae8612014-12-23 08:49:18 -0700298 Cc: stable@vger.kernel.org
Linus Torvalds1da177e2005-04-16 15:20:36 -0700299
Luke Dashjr8cda4c32015-05-14 18:58:01 +0000300into the sign-off area of your patch (note, NOT an email recipient). You
301should also read Documentation/stable_kernel_rules.txt in addition to this
302file.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700303
Jonathan Corbetccae8612014-12-23 08:49:18 -0700304Note, however, that some subsystem maintainers want to come to their own
305conclusions on which patches should go to the stable trees. The networking
306maintainer, in particular, would rather not see individual developers
307adding lines like the above to their patches.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700308
Jonathan Corbetccae8612014-12-23 08:49:18 -0700309If changes affect userland-kernel interfaces, please send the MAN-PAGES
310maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
311least a notification of the change, so that some information makes its way
312into the manual pages. User-space API changes should also be copied to
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300313linux-api@vger.kernel.org.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700314
315For small patches you may want to CC the Trivial Patch Monkey
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200316trivial@kernel.org which collects "trivial" patches. Have a look
317into the MAINTAINERS file for its current manager.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300318
Markus Heidelberg82d27b22009-06-12 01:02:34 +0200319Trivial patches must qualify for one of the following rules:
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300320
Linus Torvalds1da177e2005-04-16 15:20:36 -0700321 Spelling fixes in documentation
Jonathan Corbetccae8612014-12-23 08:49:18 -0700322 Spelling fixes for errors which could break grep(1)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700323 Warning fixes (cluttering with useless warnings is bad)
324 Compilation fixes (only if they are actually correct)
325 Runtime fixes (only if they actually fix things)
Jonathan Corbetccae8612014-12-23 08:49:18 -0700326 Removing use of deprecated functions/macros
Linus Torvalds1da177e2005-04-16 15:20:36 -0700327 Contact detail and documentation fixes
328 Non-portable code replaced by portable code (even in arch-specific,
329 since people copy, as long as it's trivial)
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700330 Any fix by the author/maintainer of the file (ie. patch monkey
Linus Torvalds1da177e2005-04-16 15:20:36 -0700331 in re-transmission mode)
Randy Dunlap84da7c02005-06-28 20:45:30 -0700332
Linus Torvalds1da177e2005-04-16 15:20:36 -0700333
334
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003356) No MIME, no links, no compression, no attachments. Just plain text
336----------------------------------------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700337
338Linus and other kernel developers need to be able to read and comment
339on the changes you are submitting. It is important for a kernel
340developer to be able to "quote" your changes, using standard e-mail
341tools, so that they may comment on specific portions of your code.
342
Sébastien Hindererbdc89212015-07-12 17:44:15 +0200343For this reason, all patches should be submitted by e-mail "inline".
Linus Torvalds1da177e2005-04-16 15:20:36 -0700344WARNING: Be wary of your editor's word-wrap corrupting your patch,
345if you choose to cut-n-paste your patch.
346
347Do not attach the patch as a MIME attachment, compressed or not.
348Many popular e-mail applications will not always transmit a MIME
349attachment as plain text, making it impossible to comment on your
350code. A MIME attachment also takes Linus a bit more time to process,
351decreasing the likelihood of your MIME-attached change being accepted.
352
353Exception: If your mailer is mangling patches then someone may ask
354you to re-send them using MIME.
355
Michael Opdenacker097091c2008-02-03 18:06:58 +0200356See Documentation/email-clients.txt for hints about configuring
357your e-mail client so that it sends your patches untouched.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700358
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003597) E-mail size
360--------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700361
362Large changes are not appropriate for mailing lists, and some
Randy Dunlap4932be72009-10-01 15:44:06 -0700363maintainers. If your patch, uncompressed, exceeds 300 kB in size,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700364it is preferred that you store your patch on an Internet-accessible
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700365server, and provide instead a URL (link) pointing to your patch. But note
366that if your patch exceeds 300 kB, it almost certainly needs to be broken up
367anyway.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700368
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003698) Respond to review comments
370-----------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700371
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700372Your patch will almost certainly get comments from reviewers on ways in
373which the patch can be improved. You must respond to those comments;
374ignoring reviewers is a good way to get ignored in return. Review comments
375or questions that do not lead to a code change should almost certainly
376bring about a comment or changelog entry so that the next reviewer better
377understands what is going on.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700378
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700379Be sure to tell the reviewers what changes you are making and to thank them
380for their time. Code review is a tiring and time-consuming process, and
381reviewers sometimes get grumpy. Even in that case, though, respond
382politely and address the problems they have pointed out.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700383
384
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -03003859) Don't get discouraged - or impatient
386---------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700387
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700388After you have submitted your change, be patient and wait. Reviewers are
389busy people and may not get to your patch right away.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700390
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700391Once upon a time, patches used to disappear into the void without comment,
392but the development process works more smoothly than that now. You should
393receive comments within a week or so; if that does not happen, make sure
394that you have sent your patches to the right place. Wait for a minimum of
395one week before resubmitting or pinging reviewers - possibly longer during
396busy times like merge windows.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700397
398
Jonathan Corbetccae8612014-12-23 08:49:18 -070039910) Include PATCH in the subject
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700400--------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700401
402Due to high e-mail traffic to Linus, and to linux-kernel, it is common
403convention to prefix your subject line with [PATCH]. This lets Linus
404and other kernel developers more easily distinguish patches from other
405e-mail discussions.
406
407
408
Jonathan Corbetccae8612014-12-23 08:49:18 -070040911) Sign your work
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700410------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700411
412To improve tracking of who did what, especially with patches that can
413percolate to their final resting place in the kernel through several
414layers of maintainers, we've introduced a "sign-off" procedure on
415patches that are being emailed around.
416
417The sign-off is a simple line at the end of the explanation for the
418patch, which certifies that you wrote it or otherwise have the right to
Zac Storerdb12fb82011-08-13 12:34:45 -0700419pass it on as an open-source patch. The rules are pretty simple: if you
Linus Torvalds1da177e2005-04-16 15:20:36 -0700420can certify the below:
421
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300422Developer's Certificate of Origin 1.1
423^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Linus Torvalds1da177e2005-04-16 15:20:36 -0700424
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300425By making a contribution to this project, I certify that:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700426
427 (a) The contribution was created in whole or in part by me and I
428 have the right to submit it under the open source license
429 indicated in the file; or
430
431 (b) The contribution is based upon previous work that, to the best
432 of my knowledge, is covered under an appropriate open source
433 license and I have the right under that license to submit that
434 work with modifications, whether created in whole or in part
435 by me, under the same open source license (unless I am
436 permitted to submit under a different license), as indicated
437 in the file; or
438
439 (c) The contribution was provided directly to me by some other
440 person who certified (a), (b) or (c) and I have not modified
441 it.
442
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800443 (d) I understand and agree that this project and the contribution
444 are public and that a record of the contribution (including all
445 personal information I submit with it, including my sign-off) is
446 maintained indefinitely and may be redistributed consistent with
447 this project or the open source license(s) involved.
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700448
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300449then you just add a line saying::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700450
Alexey Dobriyan9fd55592005-06-25 14:59:34 -0700451 Signed-off-by: Random J Developer <random@developer.example.org>
Linus Torvalds1da177e2005-04-16 15:20:36 -0700452
Greg KHaf45f322006-09-12 20:35:52 -0700453using your real name (sorry, no pseudonyms or anonymous contributions.)
454
Linus Torvalds1da177e2005-04-16 15:20:36 -0700455Some people also put extra tags at the end. They'll just be ignored for
456now, but you can do this to mark internal company procedures or just
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800457point out some special detail about the sign-off.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700458
Willy Tarreauadbd5882008-06-03 00:20:28 +0200459If you are a subsystem or branch maintainer, sometimes you need to slightly
460modify patches you receive in order to merge them, because the code is not
461exactly the same in your tree and the submitters'. If you stick strictly to
462rule (c), you should ask the submitter to rediff, but this is a totally
463counter-productive waste of time and energy. Rule (b) allows you to adjust
464the code, but then it is very impolite to change one submitter's code and
465make him endorse your bugs. To solve this problem, it is recommended that
466you add a line between the last Signed-off-by header and yours, indicating
467the nature of your changes. While there is nothing mandatory about this, it
468seems like prepending the description with your mail and/or name, all
469enclosed in square brackets, is noticeable enough to make it obvious that
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300470you are responsible for last-minute changes. Example::
Willy Tarreauadbd5882008-06-03 00:20:28 +0200471
472 Signed-off-by: Random J Developer <random@developer.example.org>
473 [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
474 Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
475
Jeremiah Mahler305af082014-05-22 00:04:26 -0700476This practice is particularly helpful if you maintain a stable branch and
Willy Tarreauadbd5882008-06-03 00:20:28 +0200477want at the same time to credit the author, track changes, merge the fix,
478and protect the submitter from complaints. Note that under no circumstances
479can you change the author's identity (the From header), as it is the one
480which appears in the changelog.
481
Jeremiah Mahler305af082014-05-22 00:04:26 -0700482Special note to back-porters: It seems to be a common and useful practice
Willy Tarreauadbd5882008-06-03 00:20:28 +0200483to insert an indication of the origin of a patch at the top of the commit
484message (just after the subject line) to facilitate tracking. For instance,
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300485here's what we see in a 3.x-stable release::
Willy Tarreauadbd5882008-06-03 00:20:28 +0200486
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300487 Date: Tue Oct 7 07:26:38 2014 -0400
Willy Tarreauadbd5882008-06-03 00:20:28 +0200488
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700489 libata: Un-break ATA blacklist
Willy Tarreauadbd5882008-06-03 00:20:28 +0200490
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700491 commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
Willy Tarreauadbd5882008-06-03 00:20:28 +0200492
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300493And here's what might appear in an older kernel once a patch is backported::
Willy Tarreauadbd5882008-06-03 00:20:28 +0200494
495 Date: Tue May 13 22:12:27 2008 +0200
496
497 wireless, airo: waitbusy() won't delay
498
499 [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
500
501Whatever the format, this information provides a valuable help to people
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700502tracking your trees, and to people trying to troubleshoot bugs in your
Willy Tarreauadbd5882008-06-03 00:20:28 +0200503tree.
504
Linus Torvalds1da177e2005-04-16 15:20:36 -0700505
Jonathan Corbetccae8612014-12-23 08:49:18 -070050612) When to use Acked-by: and Cc:
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700507---------------------------------
Andy Whitcroft0a920b52007-06-01 00:46:48 -0700508
Andrew Morton0f44cd22007-06-08 13:46:45 -0700509The Signed-off-by: tag indicates that the signer was involved in the
510development of the patch, or that he/she was in the patch's delivery path.
511
512If a person was not directly involved in the preparation or handling of a
513patch but wishes to signify and record their approval of it then they can
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700514ask to have an Acked-by: line added to the patch's changelog.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700515
516Acked-by: is often used by the maintainer of the affected code when that
517maintainer neither contributed to nor forwarded the patch.
518
519Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
520has at least reviewed the patch and has indicated acceptance. Hence patch
521mergers will sometimes manually convert an acker's "yep, looks good to me"
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700522into an Acked-by: (but note that it is usually better to ask for an
523explicit ack).
Andrew Morton0f44cd22007-06-08 13:46:45 -0700524
525Acked-by: does not necessarily indicate acknowledgement of the entire patch.
526For example, if a patch affects multiple subsystems and has an Acked-by: from
527one subsystem maintainer then this usually indicates acknowledgement of just
528the part which affects that maintainer's code. Judgement should be used here.
Jonathan Corbetef402032008-03-28 11:22:38 -0600529When in doubt people should refer to the original discussion in the mailing
Andrew Morton0f44cd22007-06-08 13:46:45 -0700530list archives.
531
Jonathan Corbetef402032008-03-28 11:22:38 -0600532If a person has had the opportunity to comment on a patch, but has not
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300533provided such comments, you may optionally add a ``Cc:`` tag to the patch.
Jonathan Corbetef402032008-03-28 11:22:38 -0600534This is the only tag which might be added without an explicit action by the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700535person it names - but it should indicate that this person was copied on the
536patch. This tag documents that potentially interested parties
537have been included in the discussion.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700538
Jonathan Corbetef402032008-03-28 11:22:38 -0600539
Jonathan Corbetccae8612014-12-23 08:49:18 -070054013) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700541--------------------------------------------------------------------------
Jonathan Corbetbbb0a4242009-01-16 09:49:50 -0700542
Dan Carpenterd75ef702014-10-29 13:01:36 +0300543The Reported-by tag gives credit to people who find bugs and report them and it
544hopefully inspires them to help us again in the future. Please note that if
545the bug was reported in private, then ask for permission first before using the
546Reported-by tag.
Jonathan Corbetef402032008-03-28 11:22:38 -0600547
548A Tested-by: tag indicates that the patch has been successfully tested (in
549some environment) by the person named. This tag informs maintainers that
550some testing has been performed, provides a means to locate testers for
551future patches, and ensures credit for the testers.
552
553Reviewed-by:, instead, indicates that the patch has been reviewed and found
554acceptable according to the Reviewer's Statement:
555
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300556Reviewer's statement of oversight
557^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jonathan Corbetef402032008-03-28 11:22:38 -0600558
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300559By offering my Reviewed-by: tag, I state that:
Jonathan Corbetef402032008-03-28 11:22:38 -0600560
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300561 (a) I have carried out a technical review of this patch to
Jonathan Corbetef402032008-03-28 11:22:38 -0600562 evaluate its appropriateness and readiness for inclusion into
563 the mainline kernel.
564
565 (b) Any problems, concerns, or questions relating to the patch
566 have been communicated back to the submitter. I am satisfied
567 with the submitter's response to my comments.
568
569 (c) While there may be things that could be improved with this
570 submission, I believe that it is, at this time, (1) a
571 worthwhile modification to the kernel, and (2) free of known
572 issues which would argue against its inclusion.
573
574 (d) While I have reviewed the patch and believe it to be sound, I
575 do not (unless explicitly stated elsewhere) make any
576 warranties or guarantees that it will achieve its stated
577 purpose or function properly in any given situation.
578
579A Reviewed-by tag is a statement of opinion that the patch is an
580appropriate modification of the kernel without any remaining serious
581technical issues. Any interested reviewer (who has done the work) can
582offer a Reviewed-by tag for a patch. This tag serves to give credit to
583reviewers and to inform maintainers of the degree of review which has been
584done on the patch. Reviewed-by: tags, when supplied by reviewers known to
585understand the subject area and to perform thorough reviews, will normally
Pavel Machek5801da12009-06-04 16:26:50 +0200586increase the likelihood of your patch getting into the kernel.
Jonathan Corbetef402032008-03-28 11:22:38 -0600587
Mugunthan V N8543ae12013-04-29 16:18:17 -0700588A Suggested-by: tag indicates that the patch idea is suggested by the person
589named and ensures credit to the person for the idea. Please note that this
590tag should not be added without the reporter's permission, especially if the
591idea was not posted in a public forum. That said, if we diligently credit our
592idea reporters, they will, hopefully, be inspired to help us again in the
593future.
594
Jacob Keller8401aa12014-06-06 14:36:39 -0700595A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
596is used to make it easy to determine where a bug originated, which can help
597review a bug fix. This tag also assists the stable kernel team in determining
598which stable kernel versions should receive your fix. This is the preferred
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300599method for indicating a bug fixed by the patch. See :ref:`describe_changes`
600for more details.
Jacob Keller8401aa12014-06-06 14:36:39 -0700601
Jonathan Corbetef402032008-03-28 11:22:38 -0600602
Jonathan Corbetccae8612014-12-23 08:49:18 -070060314) The canonical patch format
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700604------------------------------
605
606This section describes how the patch itself should be formatted. Note
607that, if you have your patches stored in a git repository, proper patch
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300608formatting can be had with ``git format-patch``. The tools cannot create
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700609the necessary text, though, so read the instructions below anyway.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700610
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300611The canonical patch subject line is::
Paul Jackson75f84262005-10-02 18:01:42 -0700612
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700613 Subject: [PATCH 001/123] subsystem: summary phrase
Paul Jackson75f84262005-10-02 18:01:42 -0700614
615The canonical patch message body contains the following:
616
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300617 - A ``from`` line specifying the patch author (only needed if the person
Jonathan Corbetccae8612014-12-23 08:49:18 -0700618 sending the patch is not the author).
Paul Jackson75f84262005-10-02 18:01:42 -0700619
620 - An empty line.
621
Joe Perches2a076f42015-04-16 12:44:28 -0700622 - The body of the explanation, line wrapped at 75 columns, which will
623 be copied to the permanent changelog to describe this patch.
Paul Jackson75f84262005-10-02 18:01:42 -0700624
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300625 - The ``Signed-off-by:`` lines, described above, which will
Paul Jackson75f84262005-10-02 18:01:42 -0700626 also go in the changelog.
627
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300628 - A marker line containing simply ``---``.
Paul Jackson75f84262005-10-02 18:01:42 -0700629
630 - Any additional comments not suitable for the changelog.
631
632 - The actual patch (diff output).
633
634The Subject line format makes it very easy to sort the emails
635alphabetically by subject line - pretty much any email reader will
636support that - since because the sequence number is zero-padded,
637the numerical and alphabetic sort is the same.
638
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300639The ``subsystem`` in the email's Subject should identify which
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700640area or subsystem of the kernel is being patched.
641
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300642The ``summary phrase`` in the email's Subject should concisely
643describe the patch which that email contains. The ``summary
644phrase`` should not be a filename. Do not use the same ``summary
645phrase`` for every patch in a whole patch series (where a ``patch
646series`` is an ordered sequence of multiple, related patches).
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700647
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300648Bear in mind that the ``summary phrase`` of your email becomes a
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400649globally-unique identifier for that patch. It propagates all the way
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300650into the git changelog. The ``summary phrase`` may later be used in
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400651developer discussions which refer to the patch. People will want to
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300652google for the ``summary phrase`` to read discussion regarding that
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400653patch. It will also be the only thing that people may quickly see
654when, two or three months later, they are going through perhaps
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300655thousands of patches using tools such as ``gitk`` or "git log
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400656--oneline".
657
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300658For these reasons, the ``summary`` must be no more than 70-75
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400659characters, and it must describe both what the patch changes, as well
660as why the patch might be necessary. It is challenging to be both
661succinct and descriptive, but that is what a well-written summary
662should do.
663
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300664The ``summary phrase`` may be prefixed by tags enclosed in square
Alex Henriee12d7462015-09-20 14:11:19 +0200665brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are
666not considered part of the summary phrase, but describe how the patch
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400667should be treated. Common tags might include a version descriptor if
668the multiple versions of the patch have been sent out in response to
669comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
670comments. If there are four patches in a patch series the individual
671patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures
672that developers understand the order in which the patches should be
673applied and that they have reviewed or applied all of the patches in
674the patch series.
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700675
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300676A couple of example Subjects::
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700677
Alex Henriee12d7462015-09-20 14:11:19 +0200678 Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
679 Subject: [PATCH v2 01/27] x86: fix eflags tracking
Paul Jackson75f84262005-10-02 18:01:42 -0700680
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300681The ``from`` line must be the very first line in the message body,
Paul Jackson75f84262005-10-02 18:01:42 -0700682and has the form:
683
684 From: Original Author <author@example.com>
685
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300686The ``from`` line specifies who will be credited as the author of the
687patch in the permanent changelog. If the ``from`` line is missing,
688then the ``From:`` line from the email header will be used to determine
Paul Jackson75f84262005-10-02 18:01:42 -0700689the patch author in the changelog.
690
691The explanation body will be committed to the permanent source
692changelog, so should make sense to a competent reader who has long
693since forgotten the immediate details of the discussion that might
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400694have led to this patch. Including symptoms of the failure which the
695patch addresses (kernel log messages, oops messages, etc.) is
696especially useful for people who might be searching the commit logs
697looking for the applicable patch. If a patch fixes a compile failure,
698it may not be necessary to include _all_ of the compile failures; just
699enough that it is likely that someone searching for the patch can find
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300700it. As in the ``summary phrase``, it is important to be both succinct as
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400701well as descriptive.
Paul Jackson75f84262005-10-02 18:01:42 -0700702
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300703The ``---`` marker line serves the essential purpose of marking for patch
Paul Jackson75f84262005-10-02 18:01:42 -0700704handling tools where the changelog message ends.
705
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300706One good use for the additional comments after the ``---`` marker is for
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400707a diffstat, to show what files have changed, and the number of
708inserted and deleted lines per file. A diffstat is especially useful
709on bigger patches. Other comments relevant only to the moment or the
710maintainer, not suitable for the permanent changelog, should also go
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300711here. A good example of such comments might be ``patch changelogs``
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400712which describe what has changed between the v1 and v2 version of the
713patch.
714
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300715If you are going to include a diffstat after the ``---`` marker, please
716use diffstat options ``-p 1 -w 70`` so that filenames are listed from
Theodore Ts'o2ae19ac2009-04-16 07:44:45 -0400717the top of the kernel source tree and don't use too much horizontal
Josh Triplett8e3072a2014-04-03 14:48:30 -0700718space (easily fit in 80 columns, maybe with some indentation). (git
719generates appropriate diffstats by default.)
Paul Jackson75f84262005-10-02 18:01:42 -0700720
721See more details on the proper patch format in the following
722references.
723
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300724.. _explicit_in_reply_to:
725
Chris Metcalfd7ac8d82015-11-05 15:21:47 -050072615) Explicit In-Reply-To headers
727--------------------------------
Paul Jackson75f84262005-10-02 18:01:42 -0700728
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500729It can be helpful to manually add In-Reply-To: headers to a patch
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300730(e.g., when using ``git send-email``) to associate the patch with
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500731previous relevant discussion, e.g. to link a bug fix to the email with
732the bug report. However, for a multi-patch series, it is generally
733best to avoid using In-Reply-To: to link to older versions of the
734series. This way multiple versions of the patch don't become an
735unmanageable forest of references in email clients. If a link is
736helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in
737the cover email text) to link to an earlier version of the patch series.
738
739
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030074016) Sending ``git pull`` requests
741---------------------------------
Randy Dunlap84da7c02005-06-28 20:45:30 -0700742
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700743If you have a series of patches, it may be most convenient to have the
744maintainer pull them directly into the subsystem repository with a
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300745``git pull`` operation. Note, however, that pulling patches from a developer
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700746requires a higher degree of trust than taking patches from a mailing list.
747As a result, many subsystem maintainers are reluctant to take pull
Jonathan Corbetb792ffe2014-12-23 09:28:40 -0700748requests, especially from new, unknown developers. If in doubt you can use
749the pull request as the cover letter for a normal posting of the patch
750series, giving the maintainer the option of using either.
Randy Dunlap14863612008-07-27 20:44:24 -0700751
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700752A pull request should have [GIT] or [PULL] in the subject line. The
753request itself should include the repository name and the branch of
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300754interest on a single line; it should look something like::
Randy Dunlap14863612008-07-27 20:44:24 -0700755
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700756 Please pull from
Randy Dunlap14863612008-07-27 20:44:24 -0700757
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700758 git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
Randy Dunlap14863612008-07-27 20:44:24 -0700759
Jakub Wilk64e32892015-07-27 10:15:18 +0200760 to get these changes:
Randy Dunlap14863612008-07-27 20:44:24 -0700761
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700762A pull request should also include an overall message saying what will be
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300763included in the request, a ``git shortlog`` listing of the patches
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700764themselves, and a diffstat showing the overall effect of the patch series.
765The easiest way to get all this information together is, of course, to let
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300766git do it for you with the ``git request-pull`` command.
Randy Dunlap14863612008-07-27 20:44:24 -0700767
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700768Some maintainers (including Linus) want to see pull requests from signed
769commits; that increases their confidence that the request actually came
770from you. Linus, in particular, will not pull from public hosting sites
771like GitHub in the absence of a signed tag.
Randy Dunlap14863612008-07-27 20:44:24 -0700772
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700773The first step toward creating such tags is to make a GNUPG key and get it
774signed by one or more core kernel developers. This step can be hard for
775new developers, but there is no way around it. Attending conferences can
776be a good way to find developers who can sign your key.
Randy Dunlap14863612008-07-27 20:44:24 -0700777
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700778Once you have prepared a patch series in git that you wish to have somebody
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300779pull, create a signed tag with ``git tag -s``. This will create a new tag
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700780identifying the last commit in the series and containing a signature
781created with your private key. You will also have the opportunity to add a
782changelog-style message to the tag; this is an ideal place to describe the
783effects of the pull request as a whole.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700784
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700785If the tree the maintainer will be pulling from is not the repository you
786are working from, don't forget to push the signed tag explicitly to the
787public tree.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700788
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700789When generating your pull request, use the signed tag as the target. A
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300790command like this will do the trick::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700791
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700792 git request-pull master git://my.public.tree/linux.git my-signed-tag
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800793
794
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300795REFERENCES
796**********
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800797
798Andrew Morton, "The perfect patch" (tpp).
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700799 <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800800
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700801Jeff Garzik, "Linux kernel patch submission format".
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800802 <http://linux.yyz.us/patch-format.html>
803
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700804Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
Vikram Narayananf5039932011-05-23 12:01:25 -0700805 <http://www.kroah.com/log/linux/maintainer.html>
806 <http://www.kroah.com/log/linux/maintainer-02.html>
807 <http://www.kroah.com/log/linux/maintainer-03.html>
808 <http://www.kroah.com/log/linux/maintainer-04.html>
809 <http://www.kroah.com/log/linux/maintainer-05.html>
Sudip Mukherjee7e0dae62014-09-07 11:26:12 -0700810 <http://www.kroah.com/log/linux/maintainer-06.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800811
Randy Dunlapbc7455f2006-07-30 03:03:45 -0700812NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
Mitchel Humpherys37c703f2014-04-03 14:50:40 -0700813 <https://lkml.org/lkml/2005/7/11/336>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800814
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700815Kernel Documentation/CodingStyle:
Luis de Bethencourt60498bb2015-07-03 16:22:11 +0100816 <Documentation/CodingStyle>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800817
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700818Linus Torvalds's mail on the canonical patch format:
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800819 <http://lkml.org/lkml/2005/4/7/183>
Andi Kleen95367272008-10-15 22:02:02 -0700820
821Andi Kleen, "On submitting kernel patches"
Lucas De Marchi25985ed2011-03-30 22:57:33 -0300822 Some strategies to get difficult or controversial changes in.
Andi Kleen95367272008-10-15 22:02:02 -0700823 http://halobates.de/on-submitting-patches.pdf
824