blob: 31ea120ce531c1e3928ab3757b7f330ed6ab1743 [file] [log] [blame]
Mauro Carvalho Chehab609d99a2016-09-19 08:07:56 -03001.. _submittingpatches:
Linus Torvalds1da177e2005-04-16 15:20:36 -07002
Jonathan Corbet89edeed2016-10-26 16:37:53 -06003Submitting patches: the essential guide to getting your code into the kernel
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
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +020013works, see Documentation/process/development-process.rst. Also, read
14Documentation/process/submit-checklist.rst
Mauro Carvalho Chehab5ff4aa72020-09-09 16:10:54 +020015for a list of items to check before submitting code. If you are submitting
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +020016a driver, also read Documentation/process/submitting-drivers.rst; for device
Erik Ekmanaa9b5e02021-11-19 21:07:58 +010017tree binding patches, read
18Documentation/devicetree/bindings/submitting-patches.rst.
Linus Torvalds1da177e2005-04-16 15:20:36 -070019
Drew DeVault9f364b62020-09-03 12:05:45 -040020This documentation assumes that you're using ``git`` to prepare your patches.
21If you're unfamiliar with ``git``, you would be well-advised to learn how to
22use it, it will make your life as a kernel developer and in general much
23easier.
Linus Torvalds1da177e2005-04-16 15:20:36 -070024
Thomas Gleixner604370e2021-09-13 17:39:41 +020025Some subsystems and maintainer trees have additional information about
Mauro Carvalho Chehabb96ff022021-11-16 12:11:23 +000026their workflow and expectations, see
27:ref:`Documentation/process/maintainer-handbooks.rst <maintainer_handbooks_main>`.
Thomas Gleixner604370e2021-09-13 17:39:41 +020028
Drew DeVaultef227c32020-09-03 12:05:42 -040029Obtain a current source tree
30----------------------------
Jonathan Corbet7994cc12014-12-23 08:43:41 -070031
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
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030044.. _describe_changes:
Randy Dunlap84da7c02005-06-28 20:45:30 -070045
Drew DeVaultef227c32020-09-03 12:05:42 -040046Describe your changes
47---------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -070048
Johannes Weiner7b9828d2014-08-05 23:32:56 -070049Describe your problem. Whether your patch is a one-line bug fix or
505000 lines of a new feature, there must be an underlying problem that
51motivated you to do this work. Convince the reviewer that there is a
52problem worth fixing and that it makes sense for them to read past the
53first paragraph.
Linus Torvalds1da177e2005-04-16 15:20:36 -070054
Johannes Weiner7b9828d2014-08-05 23:32:56 -070055Describe user-visible impact. Straight up crashes and lockups are
56pretty convincing, but not all bugs are that blatant. Even if the
57problem was spotted during code review, describe the impact you think
58it can have on users. Keep in mind that the majority of Linux
59installations run kernels from secondary stable trees or
60vendor/product-specific trees that cherry-pick only specific patches
61from upstream, so include anything that could help route your change
62downstream: provoking circumstances, excerpts from dmesg, crash
63descriptions, performance regressions, latency spikes, lockups, etc.
64
65Quantify optimizations and trade-offs. If you claim improvements in
66performance, memory consumption, stack footprint, or binary size,
67include numbers that back them up. But also describe non-obvious
68costs. Optimizations usually aren't free but trade-offs between CPU,
69memory, and readability; or, when it comes to heuristics, between
70different workloads. Describe the expected downsides of your
71optimization so that the reviewer can weigh costs against benefits.
72
73Once the problem is established, describe what you are actually doing
74about it in technical detail. It's important to describe the change
75in plain English for the reviewer to verify that the code is behaving
76as you intend it to.
Linus Torvalds1da177e2005-04-16 15:20:36 -070077
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -040078The maintainer will thank you if you write your patch description in a
79form which can be easily pulled into Linux's source code management
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -030080system, ``git``, as a "commit log". See :ref:`explicit_in_reply_to`.
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -040081
Johannes Weiner7b9828d2014-08-05 23:32:56 -070082Solve only one problem per patch. If your description starts to get
83long, that's a sign that you probably need to split up your patch.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -030084See :ref:`split_changes`.
Linus Torvalds1da177e2005-04-16 15:20:36 -070085
Randy Dunlapd89b1942010-08-09 17:20:21 -070086When you submit or resubmit a patch or patch series, include the
87complete patch description and justification for it. Don't just
88say that this is version N of the patch (series). Don't expect the
Jonathan Corbetd00c4552014-12-23 08:54:36 -070089subsystem maintainer to refer back to earlier patch versions or referenced
Randy Dunlapd89b1942010-08-09 17:20:21 -070090URLs to find the patch description and put that into the patch.
91I.e., the patch (series) and its description should be self-contained.
Jonathan Corbetd00c4552014-12-23 08:54:36 -070092This benefits both the maintainers and reviewers. Some reviewers
Randy Dunlapd89b1942010-08-09 17:20:21 -070093probably didn't even receive earlier versions of the patch.
94
Josh Triplett74a475a2014-04-03 14:48:28 -070095Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
96instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
97to do frotz", as if you are giving orders to the codebase to change
98its behaviour.
99
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700100If you want to refer to a specific commit, don't just refer to the
101SHA-1 ID of the commit. Please also include the oneline summary of
102the commit, to make it easier for reviewers to know what it is about.
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300103Example::
Geert Uytterhoeven0af52702013-07-31 14:59:38 -0700104
105 Commit e21d2170f36602ae2708 ("video: remove unnecessary
106 platform_set_drvdata()") removed the unnecessary
107 platform_set_drvdata(), but left the variable "dev" unused,
108 delete it.
109
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700110You should also be sure to use at least the first twelve characters of the
111SHA-1 ID. The kernel repository holds a *lot* of objects, making
112collisions with shorter IDs a real possibility. Bear in mind that, even if
113there is no collision with your six-character ID now, that condition may
114change five years from now.
115
Thorsten Leemhuis1f57bd42021-10-25 11:06:35 +0200116If related discussions or any other background information behind the change
117can be found on the web, add 'Link:' tags pointing to it. In case your patch
118fixes a bug, for example, add a tag with a URL referencing the report in the
119mailing list archives or a bug tracker; if the patch is a result of some
120earlier mailing list discussion or something documented on the web, point to
121it.
122
123When linking to mailing list archives, preferably use the lore.kernel.org
124message archiver service. To create the link URL, use the contents of the
125``Message-Id`` header of the message without the surrounding angle brackets.
126For example::
127
128 Link: https://lore.kernel.org/r/30th.anniversary.repost@klaava.Helsinki.FI/
129
130Please check the link to make sure that it is actually working and points
131to the relevant message.
132
133However, try to make your explanation understandable without external
134resources. In addition to giving a URL to a mailing list archive or bug,
135summarize the relevant points of the discussion that led to the
136patch as submitted.
137
Jacob Keller8401aa12014-06-06 14:36:39 -0700138If your patch fixes a bug in a specific commit, e.g. you found an issue using
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300139``git bisect``, please use the 'Fixes:' tag with the first 12 characters of
Sean Christopherson19c3fe22019-02-19 07:27:15 -0800140the SHA-1 ID, and the one line summary. Do not split the tag across multiple
141lines, tags are exempt from the "wrap at 75 columns" rule in order to simplify
142parsing scripts. For example::
Jacob Keller8401aa12014-06-06 14:36:39 -0700143
Sean Christopherson19c3fe22019-02-19 07:27:15 -0800144 Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")
Jacob Keller8401aa12014-06-06 14:36:39 -0700145
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300146The following ``git config`` settings can be used to add a pretty format for
147outputting the above style in the ``git log`` or ``git show`` commands::
Jacob Keller8401aa12014-06-06 14:36:39 -0700148
149 [core]
150 abbrev = 12
151 [pretty]
152 fixes = Fixes: %h (\"%s\")
Linus Torvalds1da177e2005-04-16 15:20:36 -0700153
Tom Rix5b5bbb82020-07-10 13:01:15 -0700154An example call::
155
156 $ git log -1 --pretty=fixes 54a4f0239f2e
157 Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed")
158
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300159.. _split_changes:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700160
Drew DeVaultef227c32020-09-03 12:05:42 -0400161Separate your changes
162---------------------
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300163
164Separate each **logical change** into a separate patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700165
166For example, if your changes include both bug fixes and performance
167enhancements for a single driver, separate those changes into two
168or more patches. If your changes include an API update, and a new
169driver which uses that new API, separate those into two patches.
170
171On the other hand, if you make a single change to numerous files,
172group those changes into a single patch. Thus a single logical change
173is contained within a single patch.
174
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700175The point to remember is that each patch should make an easily understood
176change that can be verified by reviewers. Each patch should be justifiable
177on its own merits.
178
Linus Torvalds1da177e2005-04-16 15:20:36 -0700179If one patch depends on another patch in order for a change to be
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300180complete, that is OK. Simply note **"this patch depends on patch X"**
Linus Torvalds1da177e2005-04-16 15:20:36 -0700181in your patch description.
182
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700183When dividing your change into a series of patches, take special care to
184ensure that the kernel builds and runs properly after each patch in the
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300185series. Developers using ``git bisect`` to track down a problem can end up
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700186splitting your patch series at any point; they will not thank you if you
187introduce bugs in the middle.
188
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800189If you cannot condense your patch set into a smaller set of patches,
190then only post say 15 or so at a time and wait for review and integration.
191
192
Linus Torvalds1da177e2005-04-16 15:20:36 -0700193
Drew DeVaultef227c32020-09-03 12:05:42 -0400194Style-check your changes
195------------------------
Andy Whitcroft0a920b5b2007-06-01 00:46:48 -0700196
197Check your patch for basic style violations, details of which can be
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200198found in Documentation/process/coding-style.rst.
Mauro Carvalho Chehabdca22a62016-09-21 08:51:05 -0300199Failure to do so simply wastes
Linus Nilssonf56d35e2007-07-21 17:49:06 +0200200the reviewers time and will get your patch rejected, probably
Andy Whitcroft0a920b5b2007-06-01 00:46:48 -0700201without even being read.
202
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700203One significant exception is when moving code from one file to
204another -- in this case you should not modify the moved code at all in
205the same patch which moves it. This clearly delineates the act of
206moving the code and your changes. This greatly aids review of the
207actual differences and allows tools to better track the history of
208the code itself.
Andy Whitcroft0a920b5b2007-06-01 00:46:48 -0700209
Jonathan Corbet6de16eb2014-12-23 08:38:24 -0700210Check your patches with the patch style checker prior to submission
211(scripts/checkpatch.pl). Note, though, that the style checker should be
212viewed as a guide, not as a replacement for human judgment. If your code
213looks better with a violation then its probably best left alone.
214
215The checker reports at three levels:
216 - ERROR: things that are very likely to be wrong
217 - WARNING: things requiring careful review
218 - CHECK: things requiring thought
219
220You should be able to justify all violations that remain in your
221patch.
Andy Whitcroft0a920b5b2007-06-01 00:46:48 -0700222
223
Drew DeVaultef227c32020-09-03 12:05:42 -0400224Select the recipients for your patch
225------------------------------------
Andy Whitcroft0a920b5b2007-06-01 00:46:48 -0700226
Jonathan Corbetccae8612014-12-23 08:49:18 -0700227You should always copy the appropriate subsystem maintainer(s) on any patch
228to code that they maintain; look through the MAINTAINERS file and the
229source code revision history to see who those maintainers are. The
230script scripts/get_maintainer.pl can be very useful at this step. If you
Sébastien Hindererd6eff072015-07-08 21:12:32 +0200231cannot find a maintainer for the subsystem you are working on, Andrew
Jonathan Corbetccae8612014-12-23 08:49:18 -0700232Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700233
Jonathan Corbetccae8612014-12-23 08:49:18 -0700234You should also normally choose at least one mailing list to receive a copy
Hannu Hartikainen77167b962021-07-07 16:36:35 +0300235of your patch set. linux-kernel@vger.kernel.org should be used by default
236for all patches, but the volume on that list has caused a number of
237developers to tune it out. Look in the MAINTAINERS file for a
238subsystem-specific list; your patch will probably get more attention there.
239Please do not spam unrelated lists, though.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700240
Jonathan Corbetccae8612014-12-23 08:49:18 -0700241Many kernel-related lists are hosted on vger.kernel.org; you can find a
242list of them at http://vger.kernel.org/vger-lists.html. There are
243kernel-related lists hosted elsewhere as well, though.
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800244
245Do not send more than 15 patches at once to the vger mailing lists!!!
246
Linus Torvalds1da177e2005-04-16 15:20:36 -0700247Linus Torvalds is the final arbiter of all changes accepted into the
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800248Linux kernel. His e-mail address is <torvalds@linux-foundation.org>.
Jonathan Corbetccae8612014-12-23 08:49:18 -0700249He gets a lot of e-mail, and, at this point, very few patches go through
250Linus directly, so typically you should do your best to -avoid-
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800251sending him e-mail.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700252
Jonathan Corbetccae8612014-12-23 08:49:18 -0700253If you have a patch that fixes an exploitable security bug, send that patch
254to security@kernel.org. For severe bugs, a short embargo may be considered
Nik Nyby253508c2015-06-26 12:05:39 -0400255to allow distributors to get the patch out to users; in such cases,
Krzysztof Kozlowskieb45fb22020-08-27 12:53:18 +0200256obviously, the patch should not be sent to any public lists. See also
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200257Documentation/admin-guide/security-bugs.rst.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700258
Jonathan Corbetccae8612014-12-23 08:49:18 -0700259Patches that fix a severe bug in a released kernel should be directed
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300260toward the stable maintainers by putting a line like this::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700261
Jonathan Corbetccae8612014-12-23 08:49:18 -0700262 Cc: stable@vger.kernel.org
Linus Torvalds1da177e2005-04-16 15:20:36 -0700263
Luke Dashjr8cda4c32015-05-14 18:58:01 +0000264into the sign-off area of your patch (note, NOT an email recipient). You
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200265should also read Documentation/process/stable-kernel-rules.rst
266in addition to this document.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700267
Jonathan Corbetccae8612014-12-23 08:49:18 -0700268If changes affect userland-kernel interfaces, please send the MAN-PAGES
269maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
270least a notification of the change, so that some information makes its way
271into the manual pages. User-space API changes should also be copied to
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300272linux-api@vger.kernel.org.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700273
Linus Torvalds1da177e2005-04-16 15:20:36 -0700274
Drew DeVaultef227c32020-09-03 12:05:42 -0400275No MIME, no links, no compression, no attachments. Just plain text
276-------------------------------------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700277
278Linus and other kernel developers need to be able to read and comment
279on the changes you are submitting. It is important for a kernel
280developer to be able to "quote" your changes, using standard e-mail
281tools, so that they may comment on specific portions of your code.
282
Drew DeVault9f364b62020-09-03 12:05:45 -0400283For this reason, all patches should be submitted by e-mail "inline". The
284easiest way to do this is with ``git send-email``, which is strongly
285recommended. An interactive tutorial for ``git send-email`` is available at
286https://git-send-email.io.
287
288If you choose not to use ``git send-email``:
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300289
290.. warning::
291
292 Be wary of your editor's word-wrap corrupting your patch,
293 if you choose to cut-n-paste your patch.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700294
295Do not attach the patch as a MIME attachment, compressed or not.
296Many popular e-mail applications will not always transmit a MIME
297attachment as plain text, making it impossible to comment on your
298code. A MIME attachment also takes Linus a bit more time to process,
299decreasing the likelihood of your MIME-attached change being accepted.
300
301Exception: If your mailer is mangling patches then someone may ask
302you to re-send them using MIME.
303
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200304See Documentation/process/email-clients.rst for hints about configuring
305your e-mail client so that it sends your patches untouched.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700306
Drew DeVaultef227c32020-09-03 12:05:42 -0400307Respond to review comments
308--------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700309
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700310Your patch will almost certainly get comments from reviewers on ways in
Drew DeVault9f364b62020-09-03 12:05:45 -0400311which the patch can be improved, in the form of a reply to your email. You must
312respond to those comments; ignoring reviewers is a good way to get ignored in
313return. You can simply reply to their emails to answer their comments. Review
314comments or questions that do not lead to a code change should almost certainly
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700315bring about a comment or changelog entry so that the next reviewer better
316understands what is going on.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700317
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700318Be sure to tell the reviewers what changes you are making and to thank them
319for their time. Code review is a tiring and time-consuming process, and
320reviewers sometimes get grumpy. Even in that case, though, respond
321politely and address the problems they have pointed out.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700322
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200323See Documentation/process/email-clients.rst for recommendations on email
Drew DeVault7433ff32020-09-03 12:05:43 -0400324clients and mailing list etiquette.
325
Thomas Gleixner31c9d7c2021-09-13 17:39:42 +0200326.. _resend_reminders:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700327
Drew DeVaultef227c32020-09-03 12:05:42 -0400328Don't get discouraged - or impatient
329------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700330
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700331After you have submitted your change, be patient and wait. Reviewers are
332busy people and may not get to your patch right away.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700333
Jonathan Corbet0eea2312014-12-23 08:52:01 -0700334Once upon a time, patches used to disappear into the void without comment,
335but the development process works more smoothly than that now. You should
336receive comments within a week or so; if that does not happen, make sure
337that you have sent your patches to the right place. Wait for a minimum of
338one week before resubmitting or pinging reviewers - possibly longer during
339busy times like merge windows.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700340
Borislav Petkov63494692021-04-13 13:38:34 +0200341It's also ok to resend the patch or the patch series after a couple of
342weeks with the word "RESEND" added to the subject line::
343
344 [PATCH Vx RESEND] sub/sys: Condensed patch summary
345
346Don't add "RESEND" when you are submitting a modified version of your
347patch or patch series - "RESEND" only applies to resubmission of a
348patch or patch series which have not been modified in any way from the
349previous submission.
350
Linus Torvalds1da177e2005-04-16 15:20:36 -0700351
Drew DeVaultef227c32020-09-03 12:05:42 -0400352Include PATCH in the subject
353-----------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700354
355Due to high e-mail traffic to Linus, and to linux-kernel, it is common
356convention to prefix your subject line with [PATCH]. This lets Linus
357and other kernel developers more easily distinguish patches from other
358e-mail discussions.
359
Drew DeVault9f364b62020-09-03 12:05:45 -0400360``git send-email`` will do this for you automatically.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700361
362
Drew DeVaultef227c32020-09-03 12:05:42 -0400363Sign your work - the Developer's Certificate of Origin
364------------------------------------------------------
Linus Torvalds1da177e2005-04-16 15:20:36 -0700365
366To improve tracking of who did what, especially with patches that can
367percolate to their final resting place in the kernel through several
368layers of maintainers, we've introduced a "sign-off" procedure on
369patches that are being emailed around.
370
371The sign-off is a simple line at the end of the explanation for the
372patch, which certifies that you wrote it or otherwise have the right to
Zac Storerdb12fb82011-08-13 12:34:45 -0700373pass it on as an open-source patch. The rules are pretty simple: if you
Linus Torvalds1da177e2005-04-16 15:20:36 -0700374can certify the below:
375
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300376Developer's Certificate of Origin 1.1
377^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Linus Torvalds1da177e2005-04-16 15:20:36 -0700378
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300379By making a contribution to this project, I certify that:
Linus Torvalds1da177e2005-04-16 15:20:36 -0700380
381 (a) The contribution was created in whole or in part by me and I
382 have the right to submit it under the open source license
383 indicated in the file; or
384
385 (b) The contribution is based upon previous work that, to the best
386 of my knowledge, is covered under an appropriate open source
387 license and I have the right under that license to submit that
388 work with modifications, whether created in whole or in part
389 by me, under the same open source license (unless I am
390 permitted to submit under a different license), as indicated
391 in the file; or
392
393 (c) The contribution was provided directly to me by some other
394 person who certified (a), (b) or (c) and I have not modified
395 it.
396
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800397 (d) I understand and agree that this project and the contribution
398 are public and that a record of the contribution (including all
399 personal information I submit with it, including my sign-off) is
400 maintained indefinitely and may be redistributed consistent with
401 this project or the open source license(s) involved.
Linus Torvaldscbd83da2005-06-13 17:51:55 -0700402
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300403then you just add a line saying::
Linus Torvalds1da177e2005-04-16 15:20:36 -0700404
Alexey Dobriyan9fd55592005-06-25 14:59:34 -0700405 Signed-off-by: Random J Developer <random@developer.example.org>
Linus Torvalds1da177e2005-04-16 15:20:36 -0700406
Greg KHaf45f322006-09-12 20:35:52 -0700407using your real name (sorry, no pseudonyms or anonymous contributions.)
Drew DeVault9f364b62020-09-03 12:05:45 -0400408This will be done for you automatically if you use ``git commit -s``.
Aditya Srivastava7d717882020-11-10 23:17:49 +0530409Reverts should also include "Signed-off-by". ``git revert -s`` does that
410for you.
Greg KHaf45f322006-09-12 20:35:52 -0700411
Linus Torvalds1da177e2005-04-16 15:20:36 -0700412Some people also put extra tags at the end. They'll just be ignored for
413now, but you can do this to mark internal company procedures or just
Stefan Bellere00bfcb2014-12-17 17:13:56 -0800414point out some special detail about the sign-off.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700415
Borislav Petkov9bf19b72020-12-17 19:37:56 +0100416Any further SoBs (Signed-off-by:'s) following the author's SoB are from
417people handling and transporting the patch, but were not involved in its
418development. SoB chains should reflect the **real** route a patch took
419as it was propagated to the maintainers and ultimately to Linus, with
420the first SoB entry signalling primary authorship of a single author.
421
Linus Torvalds1da177e2005-04-16 15:20:36 -0700422
Drew DeVaultef227c32020-09-03 12:05:42 -0400423When to use Acked-by:, Cc:, and Co-developed-by:
424------------------------------------------------
Andy Whitcroft0a920b5b2007-06-01 00:46:48 -0700425
Andrew Morton0f44cd22007-06-08 13:46:45 -0700426The Signed-off-by: tag indicates that the signer was involved in the
427development of the patch, or that he/she was in the patch's delivery path.
428
429If a person was not directly involved in the preparation or handling of a
430patch but wishes to signify and record their approval of it then they can
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700431ask to have an Acked-by: line added to the patch's changelog.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700432
433Acked-by: is often used by the maintainer of the affected code when that
434maintainer neither contributed to nor forwarded the patch.
435
436Acked-by: is not as formal as Signed-off-by:. It is a record that the acker
437has at least reviewed the patch and has indicated acceptance. Hence patch
438mergers will sometimes manually convert an acker's "yep, looks good to me"
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700439into an Acked-by: (but note that it is usually better to ask for an
440explicit ack).
Andrew Morton0f44cd22007-06-08 13:46:45 -0700441
442Acked-by: does not necessarily indicate acknowledgement of the entire patch.
443For example, if a patch affects multiple subsystems and has an Acked-by: from
444one subsystem maintainer then this usually indicates acknowledgement of just
445the part which affects that maintainer's code. Judgement should be used here.
Jonathan Corbetef402032008-03-28 11:22:38 -0600446When in doubt people should refer to the original discussion in the mailing
Andrew Morton0f44cd22007-06-08 13:46:45 -0700447list archives.
448
Jonathan Corbetef402032008-03-28 11:22:38 -0600449If a person has had the opportunity to comment on a patch, but has not
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300450provided such comments, you may optionally add a ``Cc:`` tag to the patch.
Jonathan Corbetef402032008-03-28 11:22:38 -0600451This is the only tag which might be added without an explicit action by the
Jonathan Corbetd00c4552014-12-23 08:54:36 -0700452person it names - but it should indicate that this person was copied on the
453patch. This tag documents that potentially interested parties
454have been included in the discussion.
Andrew Morton0f44cd22007-06-08 13:46:45 -0700455
Sean Christopherson24a2bb92019-03-22 14:11:36 -0700456Co-developed-by: states that the patch was co-created by multiple developers;
Lee Jones7e902852020-12-16 13:46:54 +0000457it is used to give attribution to co-authors (in addition to the author
Sean Christopherson24a2bb92019-03-22 14:11:36 -0700458attributed by the From: tag) when several people work on a single patch. Since
459Co-developed-by: denotes authorship, every Co-developed-by: must be immediately
460followed by a Signed-off-by: of the associated co-author. Standard sign-off
461procedure applies, i.e. the ordering of Signed-off-by: tags should reflect the
462chronological history of the patch insofar as possible, regardless of whether
463the author is attributed via From: or Co-developed-by:. Notably, the last
464Signed-off-by: must always be that of the developer submitting the patch.
465
466Note, the From: tag is optional when the From: author is also the person (and
467email) listed in the From: line of the email header.
468
469Example of a patch submitted by the From: author::
470
471 <changelog>
472
473 Co-developed-by: First Co-Author <first@coauthor.example.org>
474 Signed-off-by: First Co-Author <first@coauthor.example.org>
475 Co-developed-by: Second Co-Author <second@coauthor.example.org>
476 Signed-off-by: Second Co-Author <second@coauthor.example.org>
477 Signed-off-by: From Author <from@author.example.org>
478
479Example of a patch submitted by a Co-developed-by: author::
480
481 From: From Author <from@author.example.org>
482
483 <changelog>
484
485 Co-developed-by: Random Co-Author <random@coauthor.example.org>
486 Signed-off-by: Random Co-Author <random@coauthor.example.org>
487 Signed-off-by: From Author <from@author.example.org>
488 Co-developed-by: Submitting Co-Author <sub@coauthor.example.org>
489 Signed-off-by: Submitting Co-Author <sub@coauthor.example.org>
Tobin C. Harding82d95342018-03-05 14:58:21 +1100490
Jonathan Corbetef402032008-03-28 11:22:38 -0600491
Drew DeVaultef227c32020-09-03 12:05:42 -0400492Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
493----------------------------------------------------------------------
Jonathan Corbetbbb0a4242009-01-16 09:49:50 -0700494
Dan Carpenterd75ef702014-10-29 13:01:36 +0300495The Reported-by tag gives credit to people who find bugs and report them and it
496hopefully inspires them to help us again in the future. Please note that if
497the bug was reported in private, then ask for permission first before using the
498Reported-by tag.
Jonathan Corbetef402032008-03-28 11:22:38 -0600499
500A Tested-by: tag indicates that the patch has been successfully tested (in
501some environment) by the person named. This tag informs maintainers that
502some testing has been performed, provides a means to locate testers for
503future patches, and ensures credit for the testers.
504
505Reviewed-by:, instead, indicates that the patch has been reviewed and found
506acceptable according to the Reviewer's Statement:
507
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300508Reviewer's statement of oversight
509^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Jonathan Corbetef402032008-03-28 11:22:38 -0600510
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300511By offering my Reviewed-by: tag, I state that:
Jonathan Corbetef402032008-03-28 11:22:38 -0600512
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300513 (a) I have carried out a technical review of this patch to
Jonathan Corbetef402032008-03-28 11:22:38 -0600514 evaluate its appropriateness and readiness for inclusion into
515 the mainline kernel.
516
517 (b) Any problems, concerns, or questions relating to the patch
518 have been communicated back to the submitter. I am satisfied
519 with the submitter's response to my comments.
520
521 (c) While there may be things that could be improved with this
522 submission, I believe that it is, at this time, (1) a
523 worthwhile modification to the kernel, and (2) free of known
524 issues which would argue against its inclusion.
525
526 (d) While I have reviewed the patch and believe it to be sound, I
527 do not (unless explicitly stated elsewhere) make any
528 warranties or guarantees that it will achieve its stated
529 purpose or function properly in any given situation.
530
531A Reviewed-by tag is a statement of opinion that the patch is an
532appropriate modification of the kernel without any remaining serious
533technical issues. Any interested reviewer (who has done the work) can
534offer a Reviewed-by tag for a patch. This tag serves to give credit to
535reviewers and to inform maintainers of the degree of review which has been
536done on the patch. Reviewed-by: tags, when supplied by reviewers known to
537understand the subject area and to perform thorough reviews, will normally
Pavel Machek5801da12009-06-04 16:26:50 +0200538increase the likelihood of your patch getting into the kernel.
Jonathan Corbetef402032008-03-28 11:22:38 -0600539
Krzysztof Kozlowski030f0662020-10-13 18:27:25 +0200540Both Tested-by and Reviewed-by tags, once received on mailing list from tester
541or reviewer, should be added by author to the applicable patches when sending
542next versions. However if the patch has changed substantially in following
543version, these tags might not be applicable anymore and thus should be removed.
544Usually removal of someone's Tested-by or Reviewed-by tags should be mentioned
545in the patch changelog (after the '---' separator).
546
Mugunthan V N8543ae12013-04-29 16:18:17 -0700547A Suggested-by: tag indicates that the patch idea is suggested by the person
548named and ensures credit to the person for the idea. Please note that this
549tag should not be added without the reporter's permission, especially if the
550idea was not posted in a public forum. That said, if we diligently credit our
551idea reporters, they will, hopefully, be inspired to help us again in the
552future.
553
Jacob Keller8401aa12014-06-06 14:36:39 -0700554A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
555is used to make it easy to determine where a bug originated, which can help
556review a bug fix. This tag also assists the stable kernel team in determining
557which stable kernel versions should receive your fix. This is the preferred
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300558method for indicating a bug fixed by the patch. See :ref:`describe_changes`
559for more details.
Jacob Keller8401aa12014-06-06 14:36:39 -0700560
Lee Jonesf0ea1492021-01-13 16:33:15 +0000561Note: Attaching a Fixes: tag does not subvert the stable kernel rules
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200562process nor the requirement to Cc: stable@vger.kernel.org on all stable
Lee Jonesf0ea1492021-01-13 16:33:15 +0000563patch candidates. For more information, please read
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200564Documentation/process/stable-kernel-rules.rst.
565
Tobin C. Hardingf58252c2018-07-26 15:02:24 +1000566.. _the_canonical_patch_format:
Jonathan Corbetef402032008-03-28 11:22:38 -0600567
Drew DeVaultef227c32020-09-03 12:05:42 -0400568The canonical patch format
569--------------------------
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700570
571This section describes how the patch itself should be formatted. Note
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300572that, if you have your patches stored in a ``git`` repository, proper patch
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300573formatting can be had with ``git format-patch``. The tools cannot create
Jonathan Corbet7994cc12014-12-23 08:43:41 -0700574the necessary text, though, so read the instructions below anyway.
Randy Dunlap84da7c02005-06-28 20:45:30 -0700575
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300576The canonical patch subject line is::
Paul Jackson75f84262005-10-02 18:01:42 -0700577
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700578 Subject: [PATCH 001/123] subsystem: summary phrase
Paul Jackson75f84262005-10-02 18:01:42 -0700579
580The canonical patch message body contains the following:
581
Junio C Hamanod19b3e32017-09-25 18:36:19 +0900582 - A ``from`` line specifying the patch author, followed by an empty
583 line (only needed if the person sending the patch is not the author).
Paul Jackson75f84262005-10-02 18:01:42 -0700584
Joe Perches2a076f42015-04-16 12:44:28 -0700585 - The body of the explanation, line wrapped at 75 columns, which will
586 be copied to the permanent changelog to describe this patch.
Paul Jackson75f84262005-10-02 18:01:42 -0700587
Junio C Hamanod19b3e32017-09-25 18:36:19 +0900588 - An empty line.
589
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300590 - The ``Signed-off-by:`` lines, described above, which will
Paul Jackson75f84262005-10-02 18:01:42 -0700591 also go in the changelog.
592
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300593 - A marker line containing simply ``---``.
Paul Jackson75f84262005-10-02 18:01:42 -0700594
595 - Any additional comments not suitable for the changelog.
596
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300597 - The actual patch (``diff`` output).
Paul Jackson75f84262005-10-02 18:01:42 -0700598
599The Subject line format makes it very easy to sort the emails
600alphabetically by subject line - pretty much any email reader will
601support that - since because the sequence number is zero-padded,
602the numerical and alphabetic sort is the same.
603
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300604The ``subsystem`` in the email's Subject should identify which
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700605area or subsystem of the kernel is being patched.
606
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300607The ``summary phrase`` in the email's Subject should concisely
608describe the patch which that email contains. The ``summary
609phrase`` should not be a filename. Do not use the same ``summary
610phrase`` for every patch in a whole patch series (where a ``patch
611series`` is an ordered sequence of multiple, related patches).
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700612
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300613Bear in mind that the ``summary phrase`` of your email becomes a
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400614globally-unique identifier for that patch. It propagates all the way
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300615into the ``git`` changelog. The ``summary phrase`` may later be used in
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400616developer discussions which refer to the patch. People will want to
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300617google for the ``summary phrase`` to read discussion regarding that
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400618patch. It will also be the only thing that people may quickly see
619when, two or three months later, they are going through perhaps
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300620thousands of patches using tools such as ``gitk`` or ``git log
621--oneline``.
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400622
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300623For these reasons, the ``summary`` must be no more than 70-75
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400624characters, and it must describe both what the patch changes, as well
625as why the patch might be necessary. It is challenging to be both
626succinct and descriptive, but that is what a well-written summary
627should do.
628
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300629The ``summary phrase`` may be prefixed by tags enclosed in square
Alex Henriee12d7462015-09-20 14:11:19 +0200630brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are
631not considered part of the summary phrase, but describe how the patch
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400632should be treated. Common tags might include a version descriptor if
633the multiple versions of the patch have been sent out in response to
634comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
Borislav Petkov875f82c2021-02-15 15:19:49 +0100635comments.
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700636
Borislav Petkov875f82c2021-02-15 15:19:49 +0100637If there are four patches in a patch series the individual patches may
638be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures that developers
639understand the order in which the patches should be applied and that
640they have reviewed or applied all of the patches in the patch series.
641
642Here are some good example Subjects::
Paul Jacksond6b9acc2005-10-03 00:29:10 -0700643
Alex Henriee12d7462015-09-20 14:11:19 +0200644 Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
645 Subject: [PATCH v2 01/27] x86: fix eflags tracking
Borislav Petkov875f82c2021-02-15 15:19:49 +0100646 Subject: [PATCH v2] sub/sys: Condensed patch summary
647 Subject: [PATCH v2 M/N] sub/sys: Condensed patch summary
Paul Jackson75f84262005-10-02 18:01:42 -0700648
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300649The ``from`` line must be the very first line in the message body,
Paul Jackson75f84262005-10-02 18:01:42 -0700650and has the form:
651
Sean Christopherson24a2bb92019-03-22 14:11:36 -0700652 From: Patch Author <author@example.com>
Paul Jackson75f84262005-10-02 18:01:42 -0700653
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300654The ``from`` line specifies who will be credited as the author of the
655patch in the permanent changelog. If the ``from`` line is missing,
656then the ``From:`` line from the email header will be used to determine
Paul Jackson75f84262005-10-02 18:01:42 -0700657the patch author in the changelog.
658
659The explanation body will be committed to the permanent source
Borislav Petkov875f82c2021-02-15 15:19:49 +0100660changelog, so should make sense to a competent reader who has long since
661forgotten the immediate details of the discussion that might have led to
662this patch. Including symptoms of the failure which the patch addresses
663(kernel log messages, oops messages, etc.) are especially useful for
664people who might be searching the commit logs looking for the applicable
665patch. The text should be written in such detail so that when read
666weeks, months or even years later, it can give the reader the needed
667details to grasp the reasoning for **why** the patch was created.
Paul Jackson75f84262005-10-02 18:01:42 -0700668
Borislav Petkov875f82c2021-02-15 15:19:49 +0100669If a patch fixes a compile failure, it may not be necessary to include
670_all_ of the compile failures; just enough that it is likely that
671someone searching for the patch can find it. As in the ``summary
672phrase``, it is important to be both succinct as well as descriptive.
Paul Jackson75f84262005-10-02 18:01:42 -0700673
Borislav Petkov875f82c2021-02-15 15:19:49 +0100674The ``---`` marker line serves the essential purpose of marking for
675patch handling tools where the changelog message ends.
Theodore Ts'o2ae19aca2009-04-16 07:44:45 -0400676
Borislav Petkov875f82c2021-02-15 15:19:49 +0100677One good use for the additional comments after the ``---`` marker is
678for a ``diffstat``, to show what files have changed, and the number of
679inserted and deleted lines per file. A ``diffstat`` is especially useful
680on bigger patches. If you are going to include a ``diffstat`` after the
681``---`` marker, please use ``diffstat`` options ``-p 1 -w 70`` so that
682filenames are listed from the top of the kernel source tree and don't
683use too much horizontal space (easily fit in 80 columns, maybe with some
684indentation). (``git`` generates appropriate diffstats by default.)
685
686Other comments relevant only to the moment or the maintainer, not
687suitable for the permanent changelog, should also go here. A good
688example of such comments might be ``patch changelogs`` which describe
689what has changed between the v1 and v2 version of the patch.
690
691Please put this information **after** the ``---`` line which separates
692the changelog from the rest of the patch. The version information is
693not part of the changelog which gets committed to the git tree. It is
694additional information for the reviewers. If it's placed above the
695commit tags, it needs manual interaction to remove it. If it is below
696the separator line, it gets automatically stripped off when applying the
697patch::
698
699 <commit message>
700 ...
701 Signed-off-by: Author <author@mail>
702 ---
703 V2 -> V3: Removed redundant helper function
704 V1 -> V2: Cleaned up coding style and addressed review comments
705
706 path/to/file | 5+++--
707 ...
Paul Jackson75f84262005-10-02 18:01:42 -0700708
709See more details on the proper patch format in the following
710references.
711
Thomas Gleixner31c9d7c2021-09-13 17:39:42 +0200712.. _backtraces:
713
Borislav Petkov78f101a2020-12-22 14:05:55 +0100714Backtraces in commit mesages
715^^^^^^^^^^^^^^^^^^^^^^^^^^^^
716
717Backtraces help document the call chain leading to a problem. However,
718not all backtraces are helpful. For example, early boot call chains are
719unique and obvious. Copying the full dmesg output verbatim, however,
720adds distracting information like timestamps, module lists, register and
721stack dumps.
722
723Therefore, the most useful backtraces should distill the relevant
724information from the dump, which makes it easier to focus on the real
725issue. Here is an example of a well-trimmed backtrace::
726
727 unchecked MSR access error: WRMSR to 0xd51 (tried to write 0x0000000000000064)
728 at rIP: 0xffffffffae059994 (native_write_msr+0x4/0x20)
729 Call Trace:
730 mba_wrmsr
731 update_domains
732 rdtgroup_mkdir
733
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300734.. _explicit_in_reply_to:
735
Drew DeVaultef227c32020-09-03 12:05:42 -0400736Explicit In-Reply-To headers
737----------------------------
Paul Jackson75f84262005-10-02 18:01:42 -0700738
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500739It can be helpful to manually add In-Reply-To: headers to a patch
Mauro Carvalho Chehab59030192016-09-19 08:07:53 -0300740(e.g., when using ``git send-email``) to associate the patch with
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500741previous relevant discussion, e.g. to link a bug fix to the email with
742the bug report. However, for a multi-patch series, it is generally
743best to avoid using In-Reply-To: to link to older versions of the
744series. This way multiple versions of the patch don't become an
745unmanageable forest of references in email clients. If a link is
Thorsten Leemhuisa9d85ef2021-10-07 10:05:00 +0200746helpful, you can use the https://lore.kernel.org/ redirector (e.g., in
Chris Metcalfd7ac8d82015-11-05 15:21:47 -0500747the cover email text) to link to an earlier version of the patch series.
748
749
Drew DeVaultef227c32020-09-03 12:05:42 -0400750Providing base tree information
751-------------------------------
Konstantin Ryabitseve8686a42019-10-30 10:00:50 -0400752
753When other developers receive your patches and start the review process,
754it is often useful for them to know where in the tree history they
755should place your work. This is particularly useful for automated CI
756processes that attempt to run a series of tests in order to establish
757the quality of your submission before the maintainer starts the review.
758
759If you are using ``git format-patch`` to generate your patches, you can
760automatically include the base tree information in your submission by
761using the ``--base`` flag. The easiest and most convenient way to use
762this option is with topical branches::
763
764 $ git checkout -t -b my-topical-branch master
765 Branch 'my-topical-branch' set up to track local branch 'master'.
766 Switched to a new branch 'my-topical-branch'
767
768 [perform your edits and commits]
769
770 $ git format-patch --base=auto --cover-letter -o outgoing/ master
771 outgoing/0000-cover-letter.patch
772 outgoing/0001-First-Commit.patch
773 outgoing/...
774
775When you open ``outgoing/0000-cover-letter.patch`` for editing, you will
776notice that it will have the ``base-commit:`` trailer at the very
777bottom, which provides the reviewer and the CI tools enough information
778to properly perform ``git am`` without worrying about conflicts::
779
780 $ git checkout -b patch-review [base-commit-id]
781 Switched to a new branch 'patch-review'
782 $ git am patches.mbox
783 Applying: First Commit
784 Applying: ...
785
786Please see ``man git-format-patch`` for more information about this
787option.
788
789.. note::
790
791 The ``--base`` feature was introduced in git version 2.9.0.
792
793If you are not using git to format your patches, you can still include
794the same ``base-commit`` trailer to indicate the commit hash of the tree
795on which your work is based. You should add it either in the cover
796letter or in the first patch of the series and it should be placed
797either below the ``---`` line or at the very bottom of all other
798content, right before your email signature.
799
800
Jonathan Corbet89edeed2016-10-26 16:37:53 -0600801References
802----------
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800803
804Andrew Morton, "The perfect patch" (tpp).
Alexander A. Klimove7b43112020-06-21 15:36:30 +0200805 <https://www.ozlabs.org/~akpm/stuff/tpp.txt>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800806
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700807Jeff Garzik, "Linux kernel patch submission format".
Jacob Huisman5aff7c42019-08-16 13:22:09 +0100808 <https://web.archive.org/web/20180829112450/http://linux.yyz.us/patch-format.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800809
Pavel Machek8e9cb8f2006-09-29 02:01:29 -0700810Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
Vikram Narayananf5039932011-05-23 12:01:25 -0700811 <http://www.kroah.com/log/linux/maintainer.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300812
Vikram Narayananf5039932011-05-23 12:01:25 -0700813 <http://www.kroah.com/log/linux/maintainer-02.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300814
Vikram Narayananf5039932011-05-23 12:01:25 -0700815 <http://www.kroah.com/log/linux/maintainer-03.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300816
Vikram Narayananf5039932011-05-23 12:01:25 -0700817 <http://www.kroah.com/log/linux/maintainer-04.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300818
Vikram Narayananf5039932011-05-23 12:01:25 -0700819 <http://www.kroah.com/log/linux/maintainer-05.html>
Mauro Carvalho Chehab9b2c7672016-09-19 08:07:54 -0300820
Sudip Mukherjee7e0dae62014-09-07 11:26:12 -0700821 <http://www.kroah.com/log/linux/maintainer-06.html>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800822
Randy Dunlapbc7455f2006-07-30 03:03:45 -0700823NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
Joe Perches05a5f512021-01-10 12:41:44 -0800824 <https://lore.kernel.org/r/20050711.125305.08322243.davem@davemloft.net>
Xose Vazquez Perez5b0ed2c2006-01-08 01:02:49 -0800825
Mauro Carvalho Chehab9912d0b2021-06-16 08:27:38 +0200826Kernel Documentation/process/coding-style.rst
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:
Joe Perches05a5f512021-01-10 12:41:44 -0800829 <https://lore.kernel.org/r/Pine.LNX.4.58.0504071023190.28951@ppc970.osdl.org>
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