diff options
Diffstat (limited to 'Documentation/development-process/2.Process')
| -rw-r--r-- | Documentation/development-process/2.Process | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/development-process/2.Process b/Documentation/development-process/2.Process index d750321acd5a..11682b120e8d 100644 --- a/Documentation/development-process/2.Process +++ b/Documentation/development-process/2.Process | |||
| @@ -151,7 +151,7 @@ The stages that a patch goes through are, generally: | |||
| 151 | well. | 151 | well. |
| 152 | 152 | ||
| 153 | - Wider review. When the patch is getting close to ready for mainline | 153 | - Wider review. When the patch is getting close to ready for mainline |
| 154 | inclusion, it will be accepted by a relevant subsystem maintainer - | 154 | inclusion, it should be accepted by a relevant subsystem maintainer - |
| 155 | though this acceptance is not a guarantee that the patch will make it | 155 | though this acceptance is not a guarantee that the patch will make it |
| 156 | all the way to the mainline. The patch will show up in the maintainer's | 156 | all the way to the mainline. The patch will show up in the maintainer's |
| 157 | subsystem tree and into the staging trees (described below). When the | 157 | subsystem tree and into the staging trees (described below). When the |
| @@ -159,6 +159,15 @@ The stages that a patch goes through are, generally: | |||
| 159 | the discovery of any problems resulting from the integration of this | 159 | the discovery of any problems resulting from the integration of this |
| 160 | patch with work being done by others. | 160 | patch with work being done by others. |
| 161 | 161 | ||
| 162 | - Please note that most maintainers also have day jobs, so merging | ||
| 163 | your patch may not be their highest priority. If your patch is | ||
| 164 | getting feedback about changes that are needed, you should either | ||
| 165 | make those changes or justify why they should not be made. If your | ||
| 166 | patch has no review complaints but is not being merged by its | ||
| 167 | appropriate subsystem or driver maintainer, you should be persistent | ||
| 168 | in updating the patch to the current kernel so that it applies cleanly | ||
| 169 | and keep sending it for review and merging. | ||
| 170 | |||
| 162 | - Merging into the mainline. Eventually, a successful patch will be | 171 | - Merging into the mainline. Eventually, a successful patch will be |
| 163 | merged into the mainline repository managed by Linus Torvalds. More | 172 | merged into the mainline repository managed by Linus Torvalds. More |
| 164 | comments and/or problems may surface at this time; it is important that | 173 | comments and/or problems may surface at this time; it is important that |
| @@ -319,9 +328,9 @@ developers; even if they do not use it for their own work, they'll need git | |||
| 319 | to keep up with what other developers (and the mainline) are doing. | 328 | to keep up with what other developers (and the mainline) are doing. |
| 320 | 329 | ||
| 321 | Git is now packaged by almost all Linux distributions. There is a home | 330 | Git is now packaged by almost all Linux distributions. There is a home |
| 322 | page at | 331 | page at: |
| 323 | 332 | ||
| 324 | http://git.or.cz/ | 333 | http://git-scm.com/ |
| 325 | 334 | ||
| 326 | That page has pointers to documentation and tutorials. One should be | 335 | That page has pointers to documentation and tutorials. One should be |
| 327 | aware, in particular, of the Kernel Hacker's Guide to git, which has | 336 | aware, in particular, of the Kernel Hacker's Guide to git, which has |