diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /Documentation/stable_kernel_rules.txt | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'Documentation/stable_kernel_rules.txt')
| -rw-r--r-- | Documentation/stable_kernel_rules.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index 5effa5bd993b..e213f45cf9d7 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt | |||
| @@ -18,16 +18,15 @@ Rules on what kind of patches are accepted, and which ones are not, into the | |||
| 18 | - It cannot contain any "trivial" fixes in it (spelling changes, | 18 | - It cannot contain any "trivial" fixes in it (spelling changes, |
| 19 | whitespace cleanups, etc). | 19 | whitespace cleanups, etc). |
| 20 | - It must follow the Documentation/SubmittingPatches rules. | 20 | - It must follow the Documentation/SubmittingPatches rules. |
| 21 | - It or an equivalent fix must already exist in Linus' tree. Quote the | 21 | - It or an equivalent fix must already exist in Linus' tree (upstream). |
| 22 | respective commit ID in Linus' tree in your patch submission to -stable. | ||
| 23 | 22 | ||
| 24 | 23 | ||
| 25 | Procedure for submitting patches to the -stable tree: | 24 | Procedure for submitting patches to the -stable tree: |
| 26 | 25 | ||
| 27 | - Send the patch, after verifying that it follows the above rules, to | 26 | - Send the patch, after verifying that it follows the above rules, to |
| 28 | stable@kernel.org. | 27 | stable@kernel.org. You must note the upstream commit ID in the changelog |
| 29 | - To have the patch automatically included in the stable tree, add the | 28 | of your submission. |
| 30 | the tag | 29 | - To have the patch automatically included in the stable tree, add the tag |
| 31 | Cc: stable@kernel.org | 30 | Cc: stable@kernel.org |
| 32 | in the sign-off area. Once the patch is merged it will be applied to | 31 | in the sign-off area. Once the patch is merged it will be applied to |
| 33 | the stable tree without anything else needing to be done by the author | 32 | the stable tree without anything else needing to be done by the author |