1.. _submittingpatches: 2 3Submitting patches: the essential guide to getting your code into the kernel 4============================================================================ 5 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 11This document contains a large number of suggestions in a relatively terse 12format. For detailed information on how the kernel development process 13works, see :ref:`Documentation/process <development_process_main>`. 14Also, read :ref:`Documentation/process/submit-checklist.rst <submitchecklist>` 15for a list of items to check before 16submitting code. If you are submitting a driver, also read 17:ref:`Documentation/process/submitting-drivers.rst <submittingdrivers>`; 18for device tree binding patches, read 19Documentation/devicetree/bindings/submitting-patches.rst. 20 21Many of these steps describe the default behavior of the ``git`` version 22control system; if you use ``git`` to prepare your patches, you'll find much 23of the mechanical work done for you, though you'll still need to prepare 24and document a sensible set of patches. In general, use of ``git`` will make 25your life as a kernel developer easier. 26 27Obtain a current source tree 28---------------------------- 29 30If you do not have a repository with the current kernel source handy, use 31``git`` to obtain one. You'll want to start with the mainline repository, 32which can be grabbed with:: 33 34 git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 35 36Note, however, that you may not want to develop against the mainline tree 37directly. Most subsystem maintainers run their own trees and want to see 38patches prepared against those trees. See the **T:** entry for the subsystem 39in the MAINTAINERS file to find that tree, or simply ask the maintainer if 40the tree is not listed there. 41 42It is still possible to download kernel releases via tarballs (as described 43in the next section), but that is the hard way to do kernel development. 44 451) ``diff -up`` 46--------------- 47 48If you must generate your patches by hand, use ``diff -up`` or ``diff -uprN`` 49to create patches. Git generates patches in this form by default; if 50you're using ``git``, you can skip this section entirely. 51 52All changes to the Linux kernel occur in the form of patches, as 53generated by :manpage:`diff(1)`. When creating your patch, make sure to 54create it in "unified diff" format, as supplied by the ``-u`` argument 55to :manpage:`diff(1)`. 56Also, please use the ``-p`` argument which shows which C function each 57change is in - that makes the resultant ``diff`` a lot easier to read. 58Patches should be based in the root kernel source directory, 59not in any lower subdirectory. 60 61To create a patch for a single file, it is often sufficient to do:: 62 63 SRCTREE=linux 64 MYFILE=drivers/net/mydriver.c 65 66 cd $SRCTREE 67 cp $MYFILE $MYFILE.orig 68 vi $MYFILE # make your change 69 cd .. 70 diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch 71 72To create a patch for multiple files, you should unpack a "vanilla", 73or unmodified kernel source tree, and generate a ``diff`` against your 74own source tree. For example:: 75 76 MYSRC=/devel/linux 77 78 tar xvfz linux-3.19.tar.gz 79 mv linux-3.19 linux-3.19-vanilla 80 diff -uprN -X linux-3.19-vanilla/Documentation/dontdiff \ 81 linux-3.19-vanilla $MYSRC > /tmp/patch 82 83``dontdiff`` is a list of files which are generated by the kernel during 84the build process, and should be ignored in any :manpage:`diff(1)`-generated 85patch. 86 87Make sure your patch does not include any extra files which do not 88belong in a patch submission. Make sure to review your patch -after- 89generating it with :manpage:`diff(1)`, to ensure accuracy. 90 91If your changes produce a lot of deltas, you need to split them into 92individual patches which modify things in logical stages; see 93:ref:`split_changes`. This will facilitate review by other kernel developers, 94very important if you want your patch accepted. 95 96If you're using ``git``, ``git rebase -i`` can help you with this process. If 97you're not using ``git``, ``quilt`` <https://savannah.nongnu.org/projects/quilt> 98is another popular alternative. 99 100.. _describe_changes: 101 102Describe your changes 103--------------------- 104 105Describe your problem. Whether your patch is a one-line bug fix or 1065000 lines of a new feature, there must be an underlying problem that 107motivated you to do this work. Convince the reviewer that there is a 108problem worth fixing and that it makes sense for them to read past the 109first paragraph. 110 111Describe user-visible impact. Straight up crashes and lockups are 112pretty convincing, but not all bugs are that blatant. Even if the 113problem was spotted during code review, describe the impact you think 114it can have on users. Keep in mind that the majority of Linux 115installations run kernels from secondary stable trees or 116vendor/product-specific trees that cherry-pick only specific patches 117from upstream, so include anything that could help route your change 118downstream: provoking circumstances, excerpts from dmesg, crash 119descriptions, performance regressions, latency spikes, lockups, etc. 120 121Quantify optimizations and trade-offs. If you claim improvements in 122performance, memory consumption, stack footprint, or binary size, 123include numbers that back them up. But also describe non-obvious 124costs. Optimizations usually aren't free but trade-offs between CPU, 125memory, and readability; or, when it comes to heuristics, between 126different workloads. Describe the expected downsides of your 127optimization so that the reviewer can weigh costs against benefits. 128 129Once the problem is established, describe what you are actually doing 130about it in technical detail. It's important to describe the change 131in plain English for the reviewer to verify that the code is behaving 132as you intend it to. 133 134The maintainer will thank you if you write your patch description in a 135form which can be easily pulled into Linux's source code management 136system, ``git``, as a "commit log". See :ref:`explicit_in_reply_to`. 137 138Solve only one problem per patch. If your description starts to get 139long, that's a sign that you probably need to split up your patch. 140See :ref:`split_changes`. 141 142When you submit or resubmit a patch or patch series, include the 143complete patch description and justification for it. Don't just 144say that this is version N of the patch (series). Don't expect the 145subsystem maintainer to refer back to earlier patch versions or referenced 146URLs to find the patch description and put that into the patch. 147I.e., the patch (series) and its description should be self-contained. 148This benefits both the maintainers and reviewers. Some reviewers 149probably didn't even receive earlier versions of the patch. 150 151Describe your changes in imperative mood, e.g. "make xyzzy do frotz" 152instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy 153to do frotz", as if you are giving orders to the codebase to change 154its behaviour. 155 156If the patch fixes a logged bug entry, refer to that bug entry by 157number and URL. If the patch follows from a mailing list discussion, 158give a URL to the mailing list archive; use the https://lkml.kernel.org/ 159redirector with a ``Message-Id``, to ensure that the links cannot become 160stale. 161 162However, try to make your explanation understandable without external 163resources. In addition to giving a URL to a mailing list archive or 164bug, summarize the relevant points of the discussion that led to the 165patch as submitted. 166 167If you want to refer to a specific commit, don't just refer to the 168SHA-1 ID of the commit. Please also include the oneline summary of 169the commit, to make it easier for reviewers to know what it is about. 170Example:: 171 172 Commit e21d2170f36602ae2708 ("video: remove unnecessary 173 platform_set_drvdata()") removed the unnecessary 174 platform_set_drvdata(), but left the variable "dev" unused, 175 delete it. 176 177You should also be sure to use at least the first twelve characters of the 178SHA-1 ID. The kernel repository holds a *lot* of objects, making 179collisions with shorter IDs a real possibility. Bear in mind that, even if 180there is no collision with your six-character ID now, that condition may 181change five years from now. 182 183If your patch fixes a bug in a specific commit, e.g. you found an issue using 184``git bisect``, please use the 'Fixes:' tag with the first 12 characters of 185the SHA-1 ID, and the one line summary. Do not split the tag across multiple 186lines, tags are exempt from the "wrap at 75 columns" rule in order to simplify 187parsing scripts. For example:: 188 189 Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed") 190 191The following ``git config`` settings can be used to add a pretty format for 192outputting the above style in the ``git log`` or ``git show`` commands:: 193 194 [core] 195 abbrev = 12 196 [pretty] 197 fixes = Fixes: %h (\"%s\") 198 199An example call:: 200 201 $ git log -1 --pretty=fixes 54a4f0239f2e 202 Fixes: 54a4f0239f2e ("KVM: MMU: make kvm_mmu_zap_page() return the number of pages it actually freed") 203 204.. _split_changes: 205 206Separate your changes 207--------------------- 208 209Separate each **logical change** into a separate patch. 210 211For example, if your changes include both bug fixes and performance 212enhancements for a single driver, separate those changes into two 213or more patches. If your changes include an API update, and a new 214driver which uses that new API, separate those into two patches. 215 216On the other hand, if you make a single change to numerous files, 217group those changes into a single patch. Thus a single logical change 218is contained within a single patch. 219 220The point to remember is that each patch should make an easily understood 221change that can be verified by reviewers. Each patch should be justifiable 222on its own merits. 223 224If one patch depends on another patch in order for a change to be 225complete, that is OK. Simply note **"this patch depends on patch X"** 226in your patch description. 227 228When dividing your change into a series of patches, take special care to 229ensure that the kernel builds and runs properly after each patch in the 230series. Developers using ``git bisect`` to track down a problem can end up 231splitting your patch series at any point; they will not thank you if you 232introduce bugs in the middle. 233 234If you cannot condense your patch set into a smaller set of patches, 235then only post say 15 or so at a time and wait for review and integration. 236 237 238 239Style-check your changes 240------------------------ 241 242Check your patch for basic style violations, details of which can be 243found in 244:ref:`Documentation/process/coding-style.rst <codingstyle>`. 245Failure to do so simply wastes 246the reviewers time and will get your patch rejected, probably 247without even being read. 248 249One significant exception is when moving code from one file to 250another -- in this case you should not modify the moved code at all in 251the same patch which moves it. This clearly delineates the act of 252moving the code and your changes. This greatly aids review of the 253actual differences and allows tools to better track the history of 254the code itself. 255 256Check your patches with the patch style checker prior to submission 257(scripts/checkpatch.pl). Note, though, that the style checker should be 258viewed as a guide, not as a replacement for human judgment. If your code 259looks better with a violation then its probably best left alone. 260 261The checker reports at three levels: 262 - ERROR: things that are very likely to be wrong 263 - WARNING: things requiring careful review 264 - CHECK: things requiring thought 265 266You should be able to justify all violations that remain in your 267patch. 268 269 270Select the recipients for your patch 271------------------------------------ 272 273You should always copy the appropriate subsystem maintainer(s) on any patch 274to code that they maintain; look through the MAINTAINERS file and the 275source code revision history to see who those maintainers are. The 276script scripts/get_maintainer.pl can be very useful at this step. If you 277cannot find a maintainer for the subsystem you are working on, Andrew 278Morton (akpm@linux-foundation.org) serves as a maintainer of last resort. 279 280You should also normally choose at least one mailing list to receive a copy 281of your patch set. linux-kernel@vger.kernel.org functions as a list of 282last resort, but the volume on that list has caused a number of developers 283to tune it out. Look in the MAINTAINERS file for a subsystem-specific 284list; your patch will probably get more attention there. Please do not 285spam unrelated lists, though. 286 287Many kernel-related lists are hosted on vger.kernel.org; you can find a 288list of them at http://vger.kernel.org/vger-lists.html. There are 289kernel-related lists hosted elsewhere as well, though. 290 291Do not send more than 15 patches at once to the vger mailing lists!!! 292 293Linus Torvalds is the final arbiter of all changes accepted into the 294Linux kernel. His e-mail address is <torvalds@linux-foundation.org>. 295He gets a lot of e-mail, and, at this point, very few patches go through 296Linus directly, so typically you should do your best to -avoid- 297sending him e-mail. 298 299If you have a patch that fixes an exploitable security bug, send that patch 300to security@kernel.org. For severe bugs, a short embargo may be considered 301to allow distributors to get the patch out to users; in such cases, 302obviously, the patch should not be sent to any public lists. See also 303:ref:`Documentation/admin-guide/security-bugs.rst <security-bugs>`. 304 305Patches that fix a severe bug in a released kernel should be directed 306toward the stable maintainers by putting a line like this:: 307 308 Cc: stable@vger.kernel.org 309 310into the sign-off area of your patch (note, NOT an email recipient). You 311should also read 312:ref:`Documentation/process/stable-kernel-rules.rst <stable_kernel_rules>` 313in addition to this file. 314 315Note, however, that some subsystem maintainers want to come to their own 316conclusions on which patches should go to the stable trees. The networking 317maintainer, in particular, would rather not see individual developers 318adding lines like the above to their patches. 319 320If changes affect userland-kernel interfaces, please send the MAN-PAGES 321maintainer (as listed in the MAINTAINERS file) a man-pages patch, or at 322least a notification of the change, so that some information makes its way 323into the manual pages. User-space API changes should also be copied to 324linux-api@vger.kernel.org. 325 326For small patches you may want to CC the Trivial Patch Monkey 327trivial@kernel.org which collects "trivial" patches. Have a look 328into the MAINTAINERS file for its current manager. 329 330Trivial patches must qualify for one of the following rules: 331 332- Spelling fixes in documentation 333- Spelling fixes for errors which could break :manpage:`grep(1)` 334- Warning fixes (cluttering with useless warnings is bad) 335- Compilation fixes (only if they are actually correct) 336- Runtime fixes (only if they actually fix things) 337- Removing use of deprecated functions/macros 338- Contact detail and documentation fixes 339- Non-portable code replaced by portable code (even in arch-specific, 340 since people copy, as long as it's trivial) 341- Any fix by the author/maintainer of the file (ie. patch monkey 342 in re-transmission mode) 343 344 345 346No MIME, no links, no compression, no attachments. Just plain text 347------------------------------------------------------------------- 348 349Linus and other kernel developers need to be able to read and comment 350on the changes you are submitting. It is important for a kernel 351developer to be able to "quote" your changes, using standard e-mail 352tools, so that they may comment on specific portions of your code. 353 354For this reason, all patches should be submitted by e-mail "inline". 355 356.. warning:: 357 358 Be wary of your editor's word-wrap corrupting your patch, 359 if you choose to cut-n-paste your patch. 360 361Do not attach the patch as a MIME attachment, compressed or not. 362Many popular e-mail applications will not always transmit a MIME 363attachment as plain text, making it impossible to comment on your 364code. A MIME attachment also takes Linus a bit more time to process, 365decreasing the likelihood of your MIME-attached change being accepted. 366 367Exception: If your mailer is mangling patches then someone may ask 368you to re-send them using MIME. 369 370See :ref:`Documentation/process/email-clients.rst <email_clients>` 371for hints about configuring your e-mail client so that it sends your patches 372untouched. 373 374E-mail size 375----------- 376 377Large changes are not appropriate for mailing lists, and some 378maintainers. If your patch, uncompressed, exceeds 300 kB in size, 379it is preferred that you store your patch on an Internet-accessible 380server, and provide instead a URL (link) pointing to your patch. But note 381that if your patch exceeds 300 kB, it almost certainly needs to be broken up 382anyway. 383 384Respond to review comments 385-------------------------- 386 387Your patch will almost certainly get comments from reviewers on ways in 388which the patch can be improved. You must respond to those comments; 389ignoring reviewers is a good way to get ignored in return. Review comments 390or questions that do not lead to a code change should almost certainly 391bring about a comment or changelog entry so that the next reviewer better 392understands what is going on. 393 394Be sure to tell the reviewers what changes you are making and to thank them 395for their time. Code review is a tiring and time-consuming process, and 396reviewers sometimes get grumpy. Even in that case, though, respond 397politely and address the problems they have pointed out. 398 399See :ref:`Documentation/process/email-clients.rst` for recommendations on email 400clients and mailing list etiquette. 401 402 403Don't get discouraged - or impatient 404------------------------------------ 405 406After you have submitted your change, be patient and wait. Reviewers are 407busy people and may not get to your patch right away. 408 409Once upon a time, patches used to disappear into the void without comment, 410but the development process works more smoothly than that now. You should 411receive comments within a week or so; if that does not happen, make sure 412that you have sent your patches to the right place. Wait for a minimum of 413one week before resubmitting or pinging reviewers - possibly longer during 414busy times like merge windows. 415 416 417Include PATCH in the subject 418----------------------------- 419 420Due to high e-mail traffic to Linus, and to linux-kernel, it is common 421convention to prefix your subject line with [PATCH]. This lets Linus 422and other kernel developers more easily distinguish patches from other 423e-mail discussions. 424 425 426 427Sign your work - the Developer's Certificate of Origin 428------------------------------------------------------ 429 430To improve tracking of who did what, especially with patches that can 431percolate to their final resting place in the kernel through several 432layers of maintainers, we've introduced a "sign-off" procedure on 433patches that are being emailed around. 434 435The sign-off is a simple line at the end of the explanation for the 436patch, which certifies that you wrote it or otherwise have the right to 437pass it on as an open-source patch. The rules are pretty simple: if you 438can certify the below: 439 440Developer's Certificate of Origin 1.1 441^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 442 443By making a contribution to this project, I certify that: 444 445 (a) The contribution was created in whole or in part by me and I 446 have the right to submit it under the open source license 447 indicated in the file; or 448 449 (b) The contribution is based upon previous work that, to the best 450 of my knowledge, is covered under an appropriate open source 451 license and I have the right under that license to submit that 452 work with modifications, whether created in whole or in part 453 by me, under the same open source license (unless I am 454 permitted to submit under a different license), as indicated 455 in the file; or 456 457 (c) The contribution was provided directly to me by some other 458 person who certified (a), (b) or (c) and I have not modified 459 it. 460 461 (d) I understand and agree that this project and the contribution 462 are public and that a record of the contribution (including all 463 personal information I submit with it, including my sign-off) is 464 maintained indefinitely and may be redistributed consistent with 465 this project or the open source license(s) involved. 466 467then you just add a line saying:: 468 469 Signed-off-by: Random J Developer <random@developer.example.org> 470 471using your real name (sorry, no pseudonyms or anonymous contributions.) 472 473Some people also put extra tags at the end. They'll just be ignored for 474now, but you can do this to mark internal company procedures or just 475point out some special detail about the sign-off. 476 477 478When to use Acked-by:, Cc:, and Co-developed-by: 479------------------------------------------------ 480 481The Signed-off-by: tag indicates that the signer was involved in the 482development of the patch, or that he/she was in the patch's delivery path. 483 484If a person was not directly involved in the preparation or handling of a 485patch but wishes to signify and record their approval of it then they can 486ask to have an Acked-by: line added to the patch's changelog. 487 488Acked-by: is often used by the maintainer of the affected code when that 489maintainer neither contributed to nor forwarded the patch. 490 491Acked-by: is not as formal as Signed-off-by:. It is a record that the acker 492has at least reviewed the patch and has indicated acceptance. Hence patch 493mergers will sometimes manually convert an acker's "yep, looks good to me" 494into an Acked-by: (but note that it is usually better to ask for an 495explicit ack). 496 497Acked-by: does not necessarily indicate acknowledgement of the entire patch. 498For example, if a patch affects multiple subsystems and has an Acked-by: from 499one subsystem maintainer then this usually indicates acknowledgement of just 500the part which affects that maintainer's code. Judgement should be used here. 501When in doubt people should refer to the original discussion in the mailing 502list archives. 503 504If a person has had the opportunity to comment on a patch, but has not 505provided such comments, you may optionally add a ``Cc:`` tag to the patch. 506This is the only tag which might be added without an explicit action by the 507person it names - but it should indicate that this person was copied on the 508patch. This tag documents that potentially interested parties 509have been included in the discussion. 510 511Co-developed-by: states that the patch was co-created by multiple developers; 512it is a used to give attribution to co-authors (in addition to the author 513attributed by the From: tag) when several people work on a single patch. Since 514Co-developed-by: denotes authorship, every Co-developed-by: must be immediately 515followed by a Signed-off-by: of the associated co-author. Standard sign-off 516procedure applies, i.e. the ordering of Signed-off-by: tags should reflect the 517chronological history of the patch insofar as possible, regardless of whether 518the author is attributed via From: or Co-developed-by:. Notably, the last 519Signed-off-by: must always be that of the developer submitting the patch. 520 521Note, the From: tag is optional when the From: author is also the person (and 522email) listed in the From: line of the email header. 523 524Example of a patch submitted by the From: author:: 525 526 <changelog> 527 528 Co-developed-by: First Co-Author <first@coauthor.example.org> 529 Signed-off-by: First Co-Author <first@coauthor.example.org> 530 Co-developed-by: Second Co-Author <second@coauthor.example.org> 531 Signed-off-by: Second Co-Author <second@coauthor.example.org> 532 Signed-off-by: From Author <from@author.example.org> 533 534Example of a patch submitted by a Co-developed-by: author:: 535 536 From: From Author <from@author.example.org> 537 538 <changelog> 539 540 Co-developed-by: Random Co-Author <random@coauthor.example.org> 541 Signed-off-by: Random Co-Author <random@coauthor.example.org> 542 Signed-off-by: From Author <from@author.example.org> 543 Co-developed-by: Submitting Co-Author <sub@coauthor.example.org> 544 Signed-off-by: Submitting Co-Author <sub@coauthor.example.org> 545 546 547Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes: 548---------------------------------------------------------------------- 549 550The Reported-by tag gives credit to people who find bugs and report them and it 551hopefully inspires them to help us again in the future. Please note that if 552the bug was reported in private, then ask for permission first before using the 553Reported-by tag. 554 555A Tested-by: tag indicates that the patch has been successfully tested (in 556some environment) by the person named. This tag informs maintainers that 557some testing has been performed, provides a means to locate testers for 558future patches, and ensures credit for the testers. 559 560Reviewed-by:, instead, indicates that the patch has been reviewed and found 561acceptable according to the Reviewer's Statement: 562 563Reviewer's statement of oversight 564^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 565 566By offering my Reviewed-by: tag, I state that: 567 568 (a) I have carried out a technical review of this patch to 569 evaluate its appropriateness and readiness for inclusion into 570 the mainline kernel. 571 572 (b) Any problems, concerns, or questions relating to the patch 573 have been communicated back to the submitter. I am satisfied 574 with the submitter's response to my comments. 575 576 (c) While there may be things that could be improved with this 577 submission, I believe that it is, at this time, (1) a 578 worthwhile modification to the kernel, and (2) free of known 579 issues which would argue against its inclusion. 580 581 (d) While I have reviewed the patch and believe it to be sound, I 582 do not (unless explicitly stated elsewhere) make any 583 warranties or guarantees that it will achieve its stated 584 purpose or function properly in any given situation. 585 586A Reviewed-by tag is a statement of opinion that the patch is an 587appropriate modification of the kernel without any remaining serious 588technical issues. Any interested reviewer (who has done the work) can 589offer a Reviewed-by tag for a patch. This tag serves to give credit to 590reviewers and to inform maintainers of the degree of review which has been 591done on the patch. Reviewed-by: tags, when supplied by reviewers known to 592understand the subject area and to perform thorough reviews, will normally 593increase the likelihood of your patch getting into the kernel. 594 595A Suggested-by: tag indicates that the patch idea is suggested by the person 596named and ensures credit to the person for the idea. Please note that this 597tag should not be added without the reporter's permission, especially if the 598idea was not posted in a public forum. That said, if we diligently credit our 599idea reporters, they will, hopefully, be inspired to help us again in the 600future. 601 602A Fixes: tag indicates that the patch fixes an issue in a previous commit. It 603is used to make it easy to determine where a bug originated, which can help 604review a bug fix. This tag also assists the stable kernel team in determining 605which stable kernel versions should receive your fix. This is the preferred 606method for indicating a bug fixed by the patch. See :ref:`describe_changes` 607for more details. 608 609.. _the_canonical_patch_format: 610 611The canonical patch format 612-------------------------- 613 614This section describes how the patch itself should be formatted. Note 615that, if you have your patches stored in a ``git`` repository, proper patch 616formatting can be had with ``git format-patch``. The tools cannot create 617the necessary text, though, so read the instructions below anyway. 618 619The canonical patch subject line is:: 620 621 Subject: [PATCH 001/123] subsystem: summary phrase 622 623The canonical patch message body contains the following: 624 625 - A ``from`` line specifying the patch author, followed by an empty 626 line (only needed if the person sending the patch is not the author). 627 628 - The body of the explanation, line wrapped at 75 columns, which will 629 be copied to the permanent changelog to describe this patch. 630 631 - An empty line. 632 633 - The ``Signed-off-by:`` lines, described above, which will 634 also go in the changelog. 635 636 - A marker line containing simply ``---``. 637 638 - Any additional comments not suitable for the changelog. 639 640 - The actual patch (``diff`` output). 641 642The Subject line format makes it very easy to sort the emails 643alphabetically by subject line - pretty much any email reader will 644support that - since because the sequence number is zero-padded, 645the numerical and alphabetic sort is the same. 646 647The ``subsystem`` in the email's Subject should identify which 648area or subsystem of the kernel is being patched. 649 650The ``summary phrase`` in the email's Subject should concisely 651describe the patch which that email contains. The ``summary 652phrase`` should not be a filename. Do not use the same ``summary 653phrase`` for every patch in a whole patch series (where a ``patch 654series`` is an ordered sequence of multiple, related patches). 655 656Bear in mind that the ``summary phrase`` of your email becomes a 657globally-unique identifier for that patch. It propagates all the way 658into the ``git`` changelog. The ``summary phrase`` may later be used in 659developer discussions which refer to the patch. People will want to 660google for the ``summary phrase`` to read discussion regarding that 661patch. It will also be the only thing that people may quickly see 662when, two or three months later, they are going through perhaps 663thousands of patches using tools such as ``gitk`` or ``git log 664--oneline``. 665 666For these reasons, the ``summary`` must be no more than 70-75 667characters, and it must describe both what the patch changes, as well 668as why the patch might be necessary. It is challenging to be both 669succinct and descriptive, but that is what a well-written summary 670should do. 671 672The ``summary phrase`` may be prefixed by tags enclosed in square 673brackets: "Subject: [PATCH <tag>...] <summary phrase>". The tags are 674not considered part of the summary phrase, but describe how the patch 675should be treated. Common tags might include a version descriptor if 676the multiple versions of the patch have been sent out in response to 677comments (i.e., "v1, v2, v3"), or "RFC" to indicate a request for 678comments. If there are four patches in a patch series the individual 679patches may be numbered like this: 1/4, 2/4, 3/4, 4/4. This assures 680that developers understand the order in which the patches should be 681applied and that they have reviewed or applied all of the patches in 682the patch series. 683 684A couple of example Subjects:: 685 686 Subject: [PATCH 2/5] ext2: improve scalability of bitmap searching 687 Subject: [PATCH v2 01/27] x86: fix eflags tracking 688 689The ``from`` line must be the very first line in the message body, 690and has the form: 691 692 From: Patch Author <author@example.com> 693 694The ``from`` line specifies who will be credited as the author of the 695patch in the permanent changelog. If the ``from`` line is missing, 696then the ``From:`` line from the email header will be used to determine 697the patch author in the changelog. 698 699The explanation body will be committed to the permanent source 700changelog, so should make sense to a competent reader who has long 701since forgotten the immediate details of the discussion that might 702have led to this patch. Including symptoms of the failure which the 703patch addresses (kernel log messages, oops messages, etc.) is 704especially useful for people who might be searching the commit logs 705looking for the applicable patch. If a patch fixes a compile failure, 706it may not be necessary to include _all_ of the compile failures; just 707enough that it is likely that someone searching for the patch can find 708it. As in the ``summary phrase``, it is important to be both succinct as 709well as descriptive. 710 711The ``---`` marker line serves the essential purpose of marking for patch 712handling tools where the changelog message ends. 713 714One good use for the additional comments after the ``---`` marker is for 715a ``diffstat``, to show what files have changed, and the number of 716inserted and deleted lines per file. A ``diffstat`` is especially useful 717on bigger patches. Other comments relevant only to the moment or the 718maintainer, not suitable for the permanent changelog, should also go 719here. A good example of such comments might be ``patch changelogs`` 720which describe what has changed between the v1 and v2 version of the 721patch. 722 723If you are going to include a ``diffstat`` after the ``---`` marker, please 724use ``diffstat`` options ``-p 1 -w 70`` so that filenames are listed from 725the top of the kernel source tree and don't use too much horizontal 726space (easily fit in 80 columns, maybe with some indentation). (``git`` 727generates appropriate diffstats by default.) 728 729See more details on the proper patch format in the following 730references. 731 732.. _explicit_in_reply_to: 733 734Explicit In-Reply-To headers 735---------------------------- 736 737It can be helpful to manually add In-Reply-To: headers to a patch 738(e.g., when using ``git send-email``) to associate the patch with 739previous relevant discussion, e.g. to link a bug fix to the email with 740the bug report. However, for a multi-patch series, it is generally 741best to avoid using In-Reply-To: to link to older versions of the 742series. This way multiple versions of the patch don't become an 743unmanageable forest of references in email clients. If a link is 744helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in 745the cover email text) to link to an earlier version of the patch series. 746 747 748Providing base tree information 749------------------------------- 750 751When other developers receive your patches and start the review process, 752it is often useful for them to know where in the tree history they 753should place your work. This is particularly useful for automated CI 754processes that attempt to run a series of tests in order to establish 755the quality of your submission before the maintainer starts the review. 756 757If you are using ``git format-patch`` to generate your patches, you can 758automatically include the base tree information in your submission by 759using the ``--base`` flag. The easiest and most convenient way to use 760this option is with topical branches:: 761 762 $ git checkout -t -b my-topical-branch master 763 Branch 'my-topical-branch' set up to track local branch 'master'. 764 Switched to a new branch 'my-topical-branch' 765 766 [perform your edits and commits] 767 768 $ git format-patch --base=auto --cover-letter -o outgoing/ master 769 outgoing/0000-cover-letter.patch 770 outgoing/0001-First-Commit.patch 771 outgoing/... 772 773When you open ``outgoing/0000-cover-letter.patch`` for editing, you will 774notice that it will have the ``base-commit:`` trailer at the very 775bottom, which provides the reviewer and the CI tools enough information 776to properly perform ``git am`` without worrying about conflicts:: 777 778 $ git checkout -b patch-review [base-commit-id] 779 Switched to a new branch 'patch-review' 780 $ git am patches.mbox 781 Applying: First Commit 782 Applying: ... 783 784Please see ``man git-format-patch`` for more information about this 785option. 786 787.. note:: 788 789 The ``--base`` feature was introduced in git version 2.9.0. 790 791If you are not using git to format your patches, you can still include 792the same ``base-commit`` trailer to indicate the commit hash of the tree 793on which your work is based. You should add it either in the cover 794letter or in the first patch of the series and it should be placed 795either below the ``---`` line or at the very bottom of all other 796content, right before your email signature. 797 798 799Sending ``git pull`` requests 800----------------------------- 801 802If you have a series of patches, it may be most convenient to have the 803maintainer pull them directly into the subsystem repository with a 804``git pull`` operation. Note, however, that pulling patches from a developer 805requires a higher degree of trust than taking patches from a mailing list. 806As a result, many subsystem maintainers are reluctant to take pull 807requests, especially from new, unknown developers. If in doubt you can use 808the pull request as the cover letter for a normal posting of the patch 809series, giving the maintainer the option of using either. 810 811A pull request should have [GIT PULL] in the subject line. The 812request itself should include the repository name and the branch of 813interest on a single line; it should look something like:: 814 815 Please pull from 816 817 git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus 818 819 to get these changes: 820 821A pull request should also include an overall message saying what will be 822included in the request, a ``git shortlog`` listing of the patches 823themselves, and a ``diffstat`` showing the overall effect of the patch series. 824The easiest way to get all this information together is, of course, to let 825``git`` do it for you with the ``git request-pull`` command. 826 827Some maintainers (including Linus) want to see pull requests from signed 828commits; that increases their confidence that the request actually came 829from you. Linus, in particular, will not pull from public hosting sites 830like GitHub in the absence of a signed tag. 831 832The first step toward creating such tags is to make a GNUPG key and get it 833signed by one or more core kernel developers. This step can be hard for 834new developers, but there is no way around it. Attending conferences can 835be a good way to find developers who can sign your key. 836 837Once you have prepared a patch series in ``git`` that you wish to have somebody 838pull, create a signed tag with ``git tag -s``. This will create a new tag 839identifying the last commit in the series and containing a signature 840created with your private key. You will also have the opportunity to add a 841changelog-style message to the tag; this is an ideal place to describe the 842effects of the pull request as a whole. 843 844If the tree the maintainer will be pulling from is not the repository you 845are working from, don't forget to push the signed tag explicitly to the 846public tree. 847 848When generating your pull request, use the signed tag as the target. A 849command like this will do the trick:: 850 851 git request-pull master git://my.public.tree/linux.git my-signed-tag 852 853 854References 855---------- 856 857Andrew Morton, "The perfect patch" (tpp). 858 <https://www.ozlabs.org/~akpm/stuff/tpp.txt> 859 860Jeff Garzik, "Linux kernel patch submission format". 861 <https://web.archive.org/web/20180829112450/http://linux.yyz.us/patch-format.html> 862 863Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer". 864 <http://www.kroah.com/log/linux/maintainer.html> 865 866 <http://www.kroah.com/log/linux/maintainer-02.html> 867 868 <http://www.kroah.com/log/linux/maintainer-03.html> 869 870 <http://www.kroah.com/log/linux/maintainer-04.html> 871 872 <http://www.kroah.com/log/linux/maintainer-05.html> 873 874 <http://www.kroah.com/log/linux/maintainer-06.html> 875 876NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people! 877 <https://lkml.org/lkml/2005/7/11/336> 878 879Kernel Documentation/process/coding-style.rst: 880 :ref:`Documentation/process/coding-style.rst <codingstyle>` 881 882Linus Torvalds's mail on the canonical patch format: 883 <http://lkml.org/lkml/2005/4/7/183> 884 885Andi Kleen, "On submitting kernel patches" 886 Some strategies to get difficult or controversial changes in. 887 888 http://halobates.de/on-submitting-patches.pdf 889