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