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