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