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