submitting-patches.rst 36.3 KB
Newer Older
1
.. _submittingpatches:
L
Linus Torvalds 已提交
2

3 4
How to Get Your Change Into the Linux Kernel or Care And Operation Of Your Linus Torvalds
=========================================================================================
L
Linus Torvalds 已提交
5 6 7 8 9 10

For a person or company who wishes to submit a change to the Linux
kernel, the process can sometimes be daunting if you're not familiar
with "the system."  This text is a collection of suggestions which
can greatly increase the chances of your change being accepted.

11 12
This document contains a large number of suggestions in a relatively terse
format.  For detailed information on how the kernel development process
13
works, see :ref:`Documentation/process <development_process_main>`.
14 15
Also, read :ref:`Documentation/SubmitChecklist <submitchecklist>`
for a list of items to check before
16
submitting code.  If you are submitting a driver, also read
17 18
:ref:`Documentation/SubmittingDrivers <submittingdrivers>`;
for device tree binding patches, read
19
Documentation/devicetree/bindings/submitting-patches.txt.
L
Linus Torvalds 已提交
20

21 22
Many of these steps describe the default behavior of the ``git`` version
control system; if you use ``git`` to prepare your patches, you'll find much
23
of the mechanical work done for you, though you'll still need to prepare
24
and document a sensible set of patches.  In general, use of ``git`` will make
25
your life as a kernel developer easier.
L
Linus Torvalds 已提交
26

27 28
Creating and Sending your Change
********************************
L
Linus Torvalds 已提交
29 30


31 32 33 34
0) Obtain a current source tree
-------------------------------

If you do not have a repository with the current kernel source handy, use
35
``git`` to obtain one.  You'll want to start with the mainline repository,
36
which can be grabbed with::
37

38
  git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
39 40 41

Note, however, that you may not want to develop against the mainline tree
directly.  Most subsystem maintainers run their own trees and want to see
42
patches prepared against those trees.  See the **T:** entry for the subsystem
43 44 45 46 47
in the MAINTAINERS file to find that tree, or simply ask the maintainer if
the tree is not listed there.

It is still possible to download kernel releases via tarballs (as described
in the next section), but that is the hard way to do kernel development.
L
Linus Torvalds 已提交
48

49 50
1) ``diff -up``
---------------
L
Linus Torvalds 已提交
51

52
If you must generate your patches by hand, use ``diff -up`` or ``diff -uprN``
53
to create patches.  Git generates patches in this form by default; if
54
you're using ``git``, you can skip this section entirely.
L
Linus Torvalds 已提交
55 56

All changes to the Linux kernel occur in the form of patches, as
57 58 59
generated by :manpage:`diff(1)`.  When creating your patch, make sure to
create it in "unified diff" format, as supplied by the ``-u`` argument
to :manpage:`diff(1)`.
60
Also, please use the ``-p`` argument which shows which C function each
61
change is in - that makes the resultant ``diff`` a lot easier to read.
L
Linus Torvalds 已提交
62 63 64
Patches should be based in the root kernel source directory,
not in any lower subdirectory.

65
To create a patch for a single file, it is often sufficient to do::
L
Linus Torvalds 已提交
66

67
	SRCTREE= linux
L
Linus Torvalds 已提交
68 69 70 71 72 73 74 75 76
	MYFILE=  drivers/net/mydriver.c

	cd $SRCTREE
	cp $MYFILE $MYFILE.orig
	vi $MYFILE	# make your change
	cd ..
	diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch

To create a patch for multiple files, you should unpack a "vanilla",
77
or unmodified kernel source tree, and generate a ``diff`` against your
78
own source tree.  For example::
L
Linus Torvalds 已提交
79

80
	MYSRC= /devel/linux
L
Linus Torvalds 已提交
81

82 83 84 85
	tar xvfz linux-3.19.tar.gz
	mv linux-3.19 linux-3.19-vanilla
	diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \
		linux-3.19-vanilla $MYSRC > /tmp/patch
L
Linus Torvalds 已提交
86

87
``dontdiff`` is a list of files which are generated by the kernel during
88
the build process, and should be ignored in any :manpage:`diff(1)`-generated
89
patch.
L
Linus Torvalds 已提交
90 91 92

Make sure your patch does not include any extra files which do not
belong in a patch submission.  Make sure to review your patch -after-
93
generating it with :manpage:`diff(1)`, to ensure accuracy.
L
Linus Torvalds 已提交
94

95
If your changes produce a lot of deltas, you need to split them into
96 97
individual patches which modify things in logical stages; see
:ref:`split_changes`.  This will facilitate review by other kernel developers,
98
very important if you want your patch accepted.
L
Linus Torvalds 已提交
99

100 101
If you're using ``git``, ``git rebase -i`` can help you with this process.  If
you're not using ``git``, ``quilt`` <http://savannah.nongnu.org/projects/quilt>
102
is another popular alternative.
103

104
.. _describe_changes:
105

106 107
2) Describe your changes
------------------------
L
Linus Torvalds 已提交
108

109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
Describe your problem.  Whether your patch is a one-line bug fix or
5000 lines of a new feature, there must be an underlying problem that
motivated you to do this work.  Convince the reviewer that there is a
problem worth fixing and that it makes sense for them to read past the
first paragraph.

Describe user-visible impact.  Straight up crashes and lockups are
pretty convincing, but not all bugs are that blatant.  Even if the
problem was spotted during code review, describe the impact you think
it can have on users.  Keep in mind that the majority of Linux
installations run kernels from secondary stable trees or
vendor/product-specific trees that cherry-pick only specific patches
from upstream, so include anything that could help route your change
downstream: provoking circumstances, excerpts from dmesg, crash
descriptions, performance regressions, latency spikes, lockups, etc.

Quantify optimizations and trade-offs.  If you claim improvements in
performance, memory consumption, stack footprint, or binary size,
include numbers that back them up.  But also describe non-obvious
costs.  Optimizations usually aren't free but trade-offs between CPU,
memory, and readability; or, when it comes to heuristics, between
different workloads.  Describe the expected downsides of your
optimization so that the reviewer can weigh costs against benefits.

Once the problem is established, describe what you are actually doing
about it in technical detail.  It's important to describe the change
in plain English for the reviewer to verify that the code is behaving
as you intend it to.
L
Linus Torvalds 已提交
137

138 139
The maintainer will thank you if you write your patch description in a
form which can be easily pulled into Linux's source code management
140
system, ``git``, as a "commit log".  See :ref:`explicit_in_reply_to`.
141

142 143
Solve only one problem per patch.  If your description starts to get
long, that's a sign that you probably need to split up your patch.
144
See :ref:`split_changes`.
L
Linus Torvalds 已提交
145

146 147 148
When you submit or resubmit a patch or patch series, include the
complete patch description and justification for it.  Don't just
say that this is version N of the patch (series).  Don't expect the
149
subsystem maintainer to refer back to earlier patch versions or referenced
150 151
URLs to find the patch description and put that into the patch.
I.e., the patch (series) and its description should be self-contained.
152
This benefits both the maintainers and reviewers.  Some reviewers
153 154
probably didn't even receive earlier versions of the patch.

155 156 157 158 159
Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
to do frotz", as if you are giving orders to the codebase to change
its behaviour.

160
If the patch fixes a logged bug entry, refer to that bug entry by
161 162
number and URL.  If the patch follows from a mailing list discussion,
give a URL to the mailing list archive; use the https://lkml.kernel.org/
163
redirector with a ``Message-Id``, to ensure that the links cannot become
164 165 166 167 168 169
stale.

However, try to make your explanation understandable without external
resources.  In addition to giving a URL to a mailing list archive or
bug, summarize the relevant points of the discussion that led to the
patch as submitted.
L
Linus Torvalds 已提交
170

171 172 173
If you want to refer to a specific commit, don't just refer to the
SHA-1 ID of the commit. Please also include the oneline summary of
the commit, to make it easier for reviewers to know what it is about.
174
Example::
175 176 177 178 179 180

	Commit e21d2170f36602ae2708 ("video: remove unnecessary
	platform_set_drvdata()") removed the unnecessary
	platform_set_drvdata(), but left the variable "dev" unused,
	delete it.

181 182 183 184 185 186
You should also be sure to use at least the first twelve characters of the
SHA-1 ID.  The kernel repository holds a *lot* of objects, making
collisions with shorter IDs a real possibility.  Bear in mind that, even if
there is no collision with your six-character ID now, that condition may
change five years from now.

187
If your patch fixes a bug in a specific commit, e.g. you found an issue using
188 189
``git bisect``, please use the 'Fixes:' tag with the first 12 characters of
the SHA-1 ID, and the one line summary.  For example::
190 191 192

	Fixes: e21d2170f366 ("video: remove unnecessary platform_set_drvdata()")

193 194
The following ``git config`` settings can be used to add a pretty format for
outputting the above style in the ``git log`` or ``git show`` commands::
195 196 197 198 199

	[core]
		abbrev = 12
	[pretty]
		fixes = Fixes: %h (\"%s\")
L
Linus Torvalds 已提交
200

201 202 203 204
.. _split_changes:

3) Separate your changes
------------------------
L
Linus Torvalds 已提交
205

206
Separate each **logical change** into a separate patch.
L
Linus Torvalds 已提交
207 208 209 210 211 212 213 214 215 216

For example, if your changes include both bug fixes and performance
enhancements for a single driver, separate those changes into two
or more patches.  If your changes include an API update, and a new
driver which uses that new API, separate those into two patches.

On the other hand, if you make a single change to numerous files,
group those changes into a single patch.  Thus a single logical change
is contained within a single patch.

217 218 219 220
The point to remember is that each patch should make an easily understood
change that can be verified by reviewers.  Each patch should be justifiable
on its own merits.

L
Linus Torvalds 已提交
221
If one patch depends on another patch in order for a change to be
222
complete, that is OK.  Simply note **"this patch depends on patch X"**
L
Linus Torvalds 已提交
223 224
in your patch description.

225 226
When dividing your change into a series of patches, take special care to
ensure that the kernel builds and runs properly after each patch in the
227
series.  Developers using ``git bisect`` to track down a problem can end up
228 229 230
splitting your patch series at any point; they will not thank you if you
introduce bugs in the middle.

231 232 233 234
If you cannot condense your patch set into a smaller set of patches,
then only post say 15 or so at a time and wait for review and integration.


L
Linus Torvalds 已提交
235

236 237
4) Style-check your changes
---------------------------
238 239

Check your patch for basic style violations, details of which can be
240 241 242
found in
:ref:`Documentation/CodingStyle <codingstyle>`.
Failure to do so simply wastes
243
the reviewers time and will get your patch rejected, probably
244 245
without even being read.

246 247 248 249 250 251 252 253 254 255 256
One significant exception is when moving code from one file to
another -- in this case you should not modify the moved code at all in
the same patch which moves it.  This clearly delineates the act of
moving the code and your changes.  This greatly aids review of the
actual differences and allows tools to better track the history of
the code itself.

Check your patches with the patch style checker prior to submission
(scripts/checkpatch.pl).  Note, though, that the style checker should be
viewed as a guide, not as a replacement for human judgment.  If your code
looks better with a violation then its probably best left alone.
257

258 259 260 261
The checker reports at three levels:
 - ERROR: things that are very likely to be wrong
 - WARNING: things requiring careful review
 - CHECK: things requiring thought
262

263 264
You should be able to justify all violations that remain in your
patch.
265 266


267 268
5) Select the recipients for your patch
---------------------------------------
L
Linus Torvalds 已提交
269

270 271 272 273
You should always copy the appropriate subsystem maintainer(s) on any patch
to code that they maintain; look through the MAINTAINERS file and the
source code revision history to see who those maintainers are.  The
script scripts/get_maintainer.pl can be very useful at this step.  If you
274
cannot find a maintainer for the subsystem you are working on, Andrew
275
Morton (akpm@linux-foundation.org) serves as a maintainer of last resort.
L
Linus Torvalds 已提交
276

277 278 279 280 281 282
You should also normally choose at least one mailing list to receive a copy
of your patch set.  linux-kernel@vger.kernel.org functions as a list of
last resort, but the volume on that list has caused a number of developers
to tune it out.  Look in the MAINTAINERS file for a subsystem-specific
list; your patch will probably get more attention there.  Please do not
spam unrelated lists, though.
L
Linus Torvalds 已提交
283

284 285 286
Many kernel-related lists are hosted on vger.kernel.org; you can find a
list of them at http://vger.kernel.org/vger-lists.html.  There are
kernel-related lists hosted elsewhere as well, though.
287 288 289

Do not send more than 15 patches at once to the vger mailing lists!!!

L
Linus Torvalds 已提交
290
Linus Torvalds is the final arbiter of all changes accepted into the
291
Linux kernel.  His e-mail address is <torvalds@linux-foundation.org>.
292 293
He gets a lot of e-mail, and, at this point, very few patches go through
Linus directly, so typically you should do your best to -avoid-
294
sending him e-mail.
L
Linus Torvalds 已提交
295

296 297
If you have a patch that fixes an exploitable security bug, send that patch
to security@kernel.org.  For severe bugs, a short embargo may be considered
298
to allow distributors to get the patch out to users; in such cases,
299
obviously, the patch should not be sent to any public lists.
L
Linus Torvalds 已提交
300

301
Patches that fix a severe bug in a released kernel should be directed
302
toward the stable maintainers by putting a line like this::
L
Linus Torvalds 已提交
303

304
  Cc: stable@vger.kernel.org
L
Linus Torvalds 已提交
305

306
into the sign-off area of your patch (note, NOT an email recipient).  You
307 308 309
should also read
:ref:`Documentation/stable_kernel_rules.txt <stable_kernel_rules>`
in addition to this file.
L
Linus Torvalds 已提交
310

311 312 313 314
Note, however, that some subsystem maintainers want to come to their own
conclusions on which patches should go to the stable trees.  The networking
maintainer, in particular, would rather not see individual developers
adding lines like the above to their patches.
315

316 317 318 319
If changes affect userland-kernel interfaces, please send the MAN-PAGES
maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at
least a notification of the change, so that some information makes its way
into the manual pages.  User-space API changes should also be copied to
320
linux-api@vger.kernel.org.
L
Linus Torvalds 已提交
321 322

For small patches you may want to CC the Trivial Patch Monkey
323 324
trivial@kernel.org which collects "trivial" patches. Have a look
into the MAINTAINERS file for its current manager.
325

326
Trivial patches must qualify for one of the following rules:
327

328 329 330 331 332 333 334 335 336 337 338
- Spelling fixes in documentation
- Spelling fixes for errors which could break :manpage:`grep(1)`
- Warning fixes (cluttering with useless warnings is bad)
- Compilation fixes (only if they are actually correct)
- Runtime fixes (only if they actually fix things)
- Removing use of deprecated functions/macros
- Contact detail and documentation fixes
- Non-portable code replaced by portable code (even in arch-specific,
  since people copy, as long as it's trivial)
- Any fix by the author/maintainer of the file (ie. patch monkey
  in re-transmission mode)
339

L
Linus Torvalds 已提交
340 341


342 343
6) No MIME, no links, no compression, no attachments.  Just plain text
----------------------------------------------------------------------
L
Linus Torvalds 已提交
344 345 346 347 348 349

Linus and other kernel developers need to be able to read and comment
on the changes you are submitting.  It is important for a kernel
developer to be able to "quote" your changes, using standard e-mail
tools, so that they may comment on specific portions of your code.

350
For this reason, all patches should be submitted by e-mail "inline".
351 352 353 354 355

.. warning::

  Be wary of your editor's word-wrap corrupting your patch,
  if you choose to cut-n-paste your patch.
L
Linus Torvalds 已提交
356 357 358 359 360 361 362 363 364 365

Do not attach the patch as a MIME attachment, compressed or not.
Many popular e-mail applications will not always transmit a MIME
attachment as plain text, making it impossible to comment on your
code.  A MIME attachment also takes Linus a bit more time to process,
decreasing the likelihood of your MIME-attached change being accepted.

Exception:  If your mailer is mangling patches then someone may ask
you to re-send them using MIME.

366 367 368
See :ref:`Documentation/email-clients.txt <email_clients>`
for hints about configuring your e-mail client so that it sends your patches
untouched.
L
Linus Torvalds 已提交
369

370 371
7) E-mail size
--------------
L
Linus Torvalds 已提交
372 373

Large changes are not appropriate for mailing lists, and some
374
maintainers.  If your patch, uncompressed, exceeds 300 kB in size,
L
Linus Torvalds 已提交
375
it is preferred that you store your patch on an Internet-accessible
376 377 378
server, and provide instead a URL (link) pointing to your patch.  But note
that if your patch exceeds 300 kB, it almost certainly needs to be broken up
anyway.
L
Linus Torvalds 已提交
379

380 381
8) Respond to review comments
-----------------------------
L
Linus Torvalds 已提交
382

383 384 385 386 387 388
Your patch will almost certainly get comments from reviewers on ways in
which the patch can be improved.  You must respond to those comments;
ignoring reviewers is a good way to get ignored in return.  Review comments
or questions that do not lead to a code change should almost certainly
bring about a comment or changelog entry so that the next reviewer better
understands what is going on.
L
Linus Torvalds 已提交
389

390 391 392 393
Be sure to tell the reviewers what changes you are making and to thank them
for their time.  Code review is a tiring and time-consuming process, and
reviewers sometimes get grumpy.  Even in that case, though, respond
politely and address the problems they have pointed out.
L
Linus Torvalds 已提交
394 395


396 397
9) Don't get discouraged - or impatient
---------------------------------------
L
Linus Torvalds 已提交
398

399 400
After you have submitted your change, be patient and wait.  Reviewers are
busy people and may not get to your patch right away.
L
Linus Torvalds 已提交
401

402 403 404 405 406 407
Once upon a time, patches used to disappear into the void without comment,
but the development process works more smoothly than that now.  You should
receive comments within a week or so; if that does not happen, make sure
that you have sent your patches to the right place.  Wait for a minimum of
one week before resubmitting or pinging reviewers - possibly longer during
busy times like merge windows.
L
Linus Torvalds 已提交
408 409


410
10) Include PATCH in the subject
411
--------------------------------
L
Linus Torvalds 已提交
412 413 414 415 416 417 418 419

Due to high e-mail traffic to Linus, and to linux-kernel, it is common
convention to prefix your subject line with [PATCH].  This lets Linus
and other kernel developers more easily distinguish patches from other
e-mail discussions.



420
11) Sign your work
421
------------------
L
Linus Torvalds 已提交
422 423 424 425 426 427 428 429

To improve tracking of who did what, especially with patches that can
percolate to their final resting place in the kernel through several
layers of maintainers, we've introduced a "sign-off" procedure on
patches that are being emailed around.

The sign-off is a simple line at the end of the explanation for the
patch, which certifies that you wrote it or otherwise have the right to
430
pass it on as an open-source patch.  The rules are pretty simple: if you
L
Linus Torvalds 已提交
431 432
can certify the below:

433 434
Developer's Certificate of Origin 1.1
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
L
Linus Torvalds 已提交
435

436
By making a contribution to this project, I certify that:
L
Linus Torvalds 已提交
437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453

        (a) The contribution was created in whole or in part by me and I
            have the right to submit it under the open source license
            indicated in the file; or

        (b) The contribution is based upon previous work that, to the best
            of my knowledge, is covered under an appropriate open source
            license and I have the right under that license to submit that
            work with modifications, whether created in whole or in part
            by me, under the same open source license (unless I am
            permitted to submit under a different license), as indicated
            in the file; or

        (c) The contribution was provided directly to me by some other
            person who certified (a), (b) or (c) and I have not modified
            it.

454 455 456 457 458
        (d) I understand and agree that this project and the contribution
            are public and that a record of the contribution (including all
            personal information I submit with it, including my sign-off) is
            maintained indefinitely and may be redistributed consistent with
            this project or the open source license(s) involved.
459

460
then you just add a line saying::
L
Linus Torvalds 已提交
461

462
	Signed-off-by: Random J Developer <random@developer.example.org>
L
Linus Torvalds 已提交
463

464 465
using your real name (sorry, no pseudonyms or anonymous contributions.)

L
Linus Torvalds 已提交
466 467
Some people also put extra tags at the end.  They'll just be ignored for
now, but you can do this to mark internal company procedures or just
468
point out some special detail about the sign-off.
L
Linus Torvalds 已提交
469

470 471 472 473 474 475 476 477 478 479 480
If you are a subsystem or branch maintainer, sometimes you need to slightly
modify patches you receive in order to merge them, because the code is not
exactly the same in your tree and the submitters'. If you stick strictly to
rule (c), you should ask the submitter to rediff, but this is a totally
counter-productive waste of time and energy. Rule (b) allows you to adjust
the code, but then it is very impolite to change one submitter's code and
make him endorse your bugs. To solve this problem, it is recommended that
you add a line between the last Signed-off-by header and yours, indicating
the nature of your changes. While there is nothing mandatory about this, it
seems like prepending the description with your mail and/or name, all
enclosed in square brackets, is noticeable enough to make it obvious that
481
you are responsible for last-minute changes. Example::
482 483 484 485 486

	Signed-off-by: Random J Developer <random@developer.example.org>
	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
	Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>

487
This practice is particularly helpful if you maintain a stable branch and
488 489 490 491 492
want at the same time to credit the author, track changes, merge the fix,
and protect the submitter from complaints. Note that under no circumstances
can you change the author's identity (the From header), as it is the one
which appears in the changelog.

493
Special note to back-porters: It seems to be a common and useful practice
494 495
to insert an indication of the origin of a patch at the top of the commit
message (just after the subject line) to facilitate tracking. For instance,
496
here's what we see in a 3.x-stable release::
497

498
  Date:   Tue Oct 7 07:26:38 2014 -0400
499

500
    libata: Un-break ATA blacklist
501

502
    commit 1c40279960bcd7d52dbdf1d466b20d24b99176c8 upstream.
503

504
And here's what might appear in an older kernel once a patch is backported::
505 506 507 508 509 510 511 512

    Date:   Tue May 13 22:12:27 2008 +0200

        wireless, airo: waitbusy() won't delay

        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]

Whatever the format, this information provides a valuable help to people
513
tracking your trees, and to people trying to troubleshoot bugs in your
514 515
tree.

L
Linus Torvalds 已提交
516

517
12) When to use Acked-by: and Cc:
518
---------------------------------
519

A
Andrew Morton 已提交
520 521 522 523 524
The Signed-off-by: tag indicates that the signer was involved in the
development of the patch, or that he/she was in the patch's delivery path.

If a person was not directly involved in the preparation or handling of a
patch but wishes to signify and record their approval of it then they can
525
ask to have an Acked-by: line added to the patch's changelog.
A
Andrew Morton 已提交
526 527 528 529 530 531 532

Acked-by: is often used by the maintainer of the affected code when that
maintainer neither contributed to nor forwarded the patch.

Acked-by: is not as formal as Signed-off-by:.  It is a record that the acker
has at least reviewed the patch and has indicated acceptance.  Hence patch
mergers will sometimes manually convert an acker's "yep, looks good to me"
533 534
into an Acked-by: (but note that it is usually better to ask for an
explicit ack).
A
Andrew Morton 已提交
535 536 537 538 539

Acked-by: does not necessarily indicate acknowledgement of the entire patch.
For example, if a patch affects multiple subsystems and has an Acked-by: from
one subsystem maintainer then this usually indicates acknowledgement of just
the part which affects that maintainer's code.  Judgement should be used here.
540
When in doubt people should refer to the original discussion in the mailing
A
Andrew Morton 已提交
541 542
list archives.

543
If a person has had the opportunity to comment on a patch, but has not
544
provided such comments, you may optionally add a ``Cc:`` tag to the patch.
545
This is the only tag which might be added without an explicit action by the
546 547 548
person it names - but it should indicate that this person was copied on the
patch.  This tag documents that potentially interested parties
have been included in the discussion.
A
Andrew Morton 已提交
549

550

551
13) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
552
--------------------------------------------------------------------------
553

554 555 556 557
The Reported-by tag gives credit to people who find bugs and report them and it
hopefully inspires them to help us again in the future.  Please note that if
the bug was reported in private, then ask for permission first before using the
Reported-by tag.
558 559 560 561 562 563 564 565 566

A Tested-by: tag indicates that the patch has been successfully tested (in
some environment) by the person named.  This tag informs maintainers that
some testing has been performed, provides a means to locate testers for
future patches, and ensures credit for the testers.

Reviewed-by:, instead, indicates that the patch has been reviewed and found
acceptable according to the Reviewer's Statement:

567 568
Reviewer's statement of oversight
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
569

570
By offering my Reviewed-by: tag, I state that:
571

572
	 (a) I have carried out a technical review of this patch to
573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596
	     evaluate its appropriateness and readiness for inclusion into
	     the mainline kernel.

	 (b) Any problems, concerns, or questions relating to the patch
	     have been communicated back to the submitter.  I am satisfied
	     with the submitter's response to my comments.

	 (c) While there may be things that could be improved with this
	     submission, I believe that it is, at this time, (1) a
	     worthwhile modification to the kernel, and (2) free of known
	     issues which would argue against its inclusion.

	 (d) While I have reviewed the patch and believe it to be sound, I
	     do not (unless explicitly stated elsewhere) make any
	     warranties or guarantees that it will achieve its stated
	     purpose or function properly in any given situation.

A Reviewed-by tag is a statement of opinion that the patch is an
appropriate modification of the kernel without any remaining serious
technical issues.  Any interested reviewer (who has done the work) can
offer a Reviewed-by tag for a patch.  This tag serves to give credit to
reviewers and to inform maintainers of the degree of review which has been
done on the patch.  Reviewed-by: tags, when supplied by reviewers known to
understand the subject area and to perform thorough reviews, will normally
P
Pavel Machek 已提交
597
increase the likelihood of your patch getting into the kernel.
598

599 600 601 602 603 604 605
A Suggested-by: tag indicates that the patch idea is suggested by the person
named and ensures credit to the person for the idea. Please note that this
tag should not be added without the reporter's permission, especially if the
idea was not posted in a public forum. That said, if we diligently credit our
idea reporters, they will, hopefully, be inspired to help us again in the
future.

606 607 608 609
A Fixes: tag indicates that the patch fixes an issue in a previous commit. It
is used to make it easy to determine where a bug originated, which can help
review a bug fix. This tag also assists the stable kernel team in determining
which stable kernel versions should receive your fix. This is the preferred
610 611
method for indicating a bug fixed by the patch. See :ref:`describe_changes`
for more details.
612

613

614
14) The canonical patch format
615 616 617
------------------------------

This section describes how the patch itself should be formatted.  Note
618
that, if you have your patches stored in a ``git`` repository, proper patch
619
formatting can be had with ``git format-patch``.  The tools cannot create
620
the necessary text, though, so read the instructions below anyway.
621

622
The canonical patch subject line is::
623

624
    Subject: [PATCH 001/123] subsystem: summary phrase
625 626 627

The canonical patch message body contains the following:

628
  - A ``from`` line specifying the patch author (only needed if the person
629
    sending the patch is not the author).
630 631 632

  - An empty line.

633 634
  - The body of the explanation, line wrapped at 75 columns, which will
    be copied to the permanent changelog to describe this patch.
635

636
  - The ``Signed-off-by:`` lines, described above, which will
637 638
    also go in the changelog.

639
  - A marker line containing simply ``---``.
640 641 642

  - Any additional comments not suitable for the changelog.

643
  - The actual patch (``diff`` output).
644 645 646 647 648 649

The Subject line format makes it very easy to sort the emails
alphabetically by subject line - pretty much any email reader will
support that - since because the sequence number is zero-padded,
the numerical and alphabetic sort is the same.

650
The ``subsystem`` in the email's Subject should identify which
651 652
area or subsystem of the kernel is being patched.

653 654 655 656 657
The ``summary phrase`` in the email's Subject should concisely
describe the patch which that email contains.  The ``summary
phrase`` should not be a filename.  Do not use the same ``summary
phrase`` for every patch in a whole patch series (where a ``patch
series`` is an ordered sequence of multiple, related patches).
658

659
Bear in mind that the ``summary phrase`` of your email becomes a
660
globally-unique identifier for that patch.  It propagates all the way
661
into the ``git`` changelog.  The ``summary phrase`` may later be used in
662
developer discussions which refer to the patch.  People will want to
663
google for the ``summary phrase`` to read discussion regarding that
664 665
patch.  It will also be the only thing that people may quickly see
when, two or three months later, they are going through perhaps
666 667
thousands of patches using tools such as ``gitk`` or ``git log
--oneline``.
668

669
For these reasons, the ``summary`` must be no more than 70-75
670 671 672 673 674
characters, and it must describe both what the patch changes, as well
as why the patch might be necessary.  It is challenging to be both
succinct and descriptive, but that is what a well-written summary
should do.

675
The ``summary phrase`` may be prefixed by tags enclosed in square
676 677
brackets: "Subject: [PATCH <tag>...] <summary phrase>".  The tags are
not considered part of the summary phrase, but describe how the patch
678 679 680 681 682 683 684 685
should be treated.  Common tags might include a version descriptor if
the multiple versions of the patch have been sent out in response to
comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for
comments.  If there are four patches in a patch series the individual
patches may be numbered like this: 1/4, 2/4, 3/4, 4/4.  This assures
that developers understand the order in which the patches should be
applied and that they have reviewed or applied all of the patches in
the patch series.
686

687
A couple of example Subjects::
688

689 690
    Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching
    Subject: [PATCH v2 01/27] x86: fix eflags tracking
691

692
The ``from`` line must be the very first line in the message body,
693 694 695 696
and has the form:

        From: Original Author <author@example.com>

697 698 699
The ``from`` line specifies who will be credited as the author of the
patch in the permanent changelog.  If the ``from`` line is missing,
then the ``From:`` line from the email header will be used to determine
700 701 702 703 704
the patch author in the changelog.

The explanation body will be committed to the permanent source
changelog, so should make sense to a competent reader who has long
since forgotten the immediate details of the discussion that might
705 706 707 708 709 710
have led to this patch.  Including symptoms of the failure which the
patch addresses (kernel log messages, oops messages, etc.) is
especially useful for people who might be searching the commit logs
looking for the applicable patch.  If a patch fixes a compile failure,
it may not be necessary to include _all_ of the compile failures; just
enough that it is likely that someone searching for the patch can find
711
it.  As in the ``summary phrase``, it is important to be both succinct as
712
well as descriptive.
713

714
The ``---`` marker line serves the essential purpose of marking for patch
715 716
handling tools where the changelog message ends.

717
One good use for the additional comments after the ``---`` marker is for
718 719
a ``diffstat``, to show what files have changed, and the number of
inserted and deleted lines per file.  A ``diffstat`` is especially useful
720 721
on bigger patches.  Other comments relevant only to the moment or the
maintainer, not suitable for the permanent changelog, should also go
722
here.  A good example of such comments might be ``patch changelogs``
723 724 725
which describe what has changed between the v1 and v2 version of the
patch.

726 727
If you are going to include a ``diffstat`` after the ``---`` marker, please
use ``diffstat`` options ``-p 1 -w 70`` so that filenames are listed from
728
the top of the kernel source tree and don't use too much horizontal
729
space (easily fit in 80 columns, maybe with some indentation).  (``git``
730
generates appropriate diffstats by default.)
731 732 733 734

See more details on the proper patch format in the following
references.

735 736
.. _explicit_in_reply_to:

737 738 739 740
15) Explicit In-Reply-To headers
--------------------------------

It can be helpful to manually add In-Reply-To: headers to a patch
741
(e.g., when using ``git send-email``) to associate the patch with
742 743 744 745 746 747 748 749
previous relevant discussion, e.g. to link a bug fix to the email with
the bug report.  However, for a multi-patch series, it is generally
best to avoid using In-Reply-To: to link to older versions of the
series.  This way multiple versions of the patch don't become an
unmanageable forest of references in email clients.  If a link is
helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in
the cover email text) to link to an earlier version of the patch series.

750

751 752
16) Sending ``git pull`` requests
---------------------------------
L
Linus Torvalds 已提交
753

754 755
If you have a series of patches, it may be most convenient to have the
maintainer pull them directly into the subsystem repository with a
756
``git pull`` operation.  Note, however, that pulling patches from a developer
757 758
requires a higher degree of trust than taking patches from a mailing list.
As a result, many subsystem maintainers are reluctant to take pull
759 760 761
requests, especially from new, unknown developers.  If in doubt you can use
the pull request as the cover letter for a normal posting of the patch
series, giving the maintainer the option of using either.
L
Linus Torvalds 已提交
762

763 764
A pull request should have [GIT] or [PULL] in the subject line.  The
request itself should include the repository name and the branch of
765
interest on a single line; it should look something like::
L
Linus Torvalds 已提交
766

767
  Please pull from
L
Linus Torvalds 已提交
768

769
      git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
L
Linus Torvalds 已提交
770

771
  to get these changes:
L
Linus Torvalds 已提交
772

773
A pull request should also include an overall message saying what will be
774
included in the request, a ``git shortlog`` listing of the patches
775
themselves, and a ``diffstat`` showing the overall effect of the patch series.
776
The easiest way to get all this information together is, of course, to let
777
``git`` do it for you with the ``git request-pull`` command.
L
Linus Torvalds 已提交
778

779 780 781 782
Some maintainers (including Linus) want to see pull requests from signed
commits; that increases their confidence that the request actually came
from you.  Linus, in particular, will not pull from public hosting sites
like GitHub in the absence of a signed tag.
L
Linus Torvalds 已提交
783

784 785 786 787
The first step toward creating such tags is to make a GNUPG key and get it
signed by one or more core kernel developers.  This step can be hard for
new developers, but there is no way around it.  Attending conferences can
be a good way to find developers who can sign your key.
L
Linus Torvalds 已提交
788

789
Once you have prepared a patch series in ``git`` that you wish to have somebody
790
pull, create a signed tag with ``git tag -s``.  This will create a new tag
791 792 793 794
identifying the last commit in the series and containing a signature
created with your private key.  You will also have the opportunity to add a
changelog-style message to the tag; this is an ideal place to describe the
effects of the pull request as a whole.
L
Linus Torvalds 已提交
795

796 797 798
If the tree the maintainer will be pulling from is not the repository you
are working from, don't forget to push the signed tag explicitly to the
public tree.
L
Linus Torvalds 已提交
799

800
When generating your pull request, use the signed tag as the target.  A
801
command like this will do the trick::
L
Linus Torvalds 已提交
802

803
  git request-pull master git://my.public.tree/linux.git my-signed-tag
804 805


806 807
REFERENCES
**********
808 809

Andrew Morton, "The perfect patch" (tpp).
810
  <http://www.ozlabs.org/~akpm/stuff/tpp.txt>
811

812
Jeff Garzik, "Linux kernel patch submission format".
813 814
  <http://linux.yyz.us/patch-format.html>

815
Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
816
  <http://www.kroah.com/log/linux/maintainer.html>
817

818
  <http://www.kroah.com/log/linux/maintainer-02.html>
819

820
  <http://www.kroah.com/log/linux/maintainer-03.html>
821

822
  <http://www.kroah.com/log/linux/maintainer-04.html>
823

824
  <http://www.kroah.com/log/linux/maintainer-05.html>
825

826
  <http://www.kroah.com/log/linux/maintainer-06.html>
827

828
NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
829
  <https://lkml.org/lkml/2005/7/11/336>
830

831
Kernel Documentation/CodingStyle:
832
  :ref:`Documentation/CodingStyle <codingstyle>`
833

834
Linus Torvalds's mail on the canonical patch format:
835
  <http://lkml.org/lkml/2005/4/7/183>
836 837

Andi Kleen, "On submitting kernel patches"
L
Lucas De Marchi 已提交
838
  Some strategies to get difficult or controversial changes in.
839

840
  http://halobates.de/on-submitting-patches.pdf