diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 18:24:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 18:24:27 -0700 |
| commit | a2340be047aaf026cbec6ee649c3f1eaf2bc7bd7 (patch) | |
| tree | 644d8c2a5315b55012f82d7902c29434cf5d20b8 /Documentation | |
| parent | 7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb (diff) | |
| parent | a30dcb4f68fb60440f71b3e62bc5c15f631d14f9 (diff) | |
| download | op-kernel-dev-a2340be047aaf026cbec6ee649c3f1eaf2bc7bd7.zip op-kernel-dev-a2340be047aaf026cbec6ee649c3f1eaf2bc7bd7.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
sysfs: use sysfs_attr_init in ASUS atk0110 driver
Documentation/HOWTO: update git home URL
Documentation: -stable rules: upstream commit ID requirement reworded
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/HOWTO | 2 | ||||
| -rw-r--r-- | Documentation/stable_kernel_rules.txt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO index f5395af..40ada93 100644 --- a/Documentation/HOWTO +++ b/Documentation/HOWTO @@ -234,7 +234,7 @@ process is as follows: Linus, usually the patches that have already been included in the -next kernel for a few weeks. The preferred way to submit big changes is using git (the kernel's source management tool, more information - can be found at http://git.or.cz/) but plain patches are also just + can be found at http://git-scm.com/) but plain patches are also just fine. - After two weeks a -rc1 kernel is released it is now possible to push only patches that do not include new features that could affect the diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index 5effa5b..e213f45 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 - It cannot contain any "trivial" fixes in it (spelling changes, whitespace cleanups, etc). - It must follow the Documentation/SubmittingPatches rules. - - It or an equivalent fix must already exist in Linus' tree. Quote the - respective commit ID in Linus' tree in your patch submission to -stable. + - It or an equivalent fix must already exist in Linus' tree (upstream). Procedure for submitting patches to the -stable tree: - Send the patch, after verifying that it follows the above rules, to - stable@kernel.org. - - To have the patch automatically included in the stable tree, add the - the tag + stable@kernel.org. You must note the upstream commit ID in the changelog + of your submission. + - To have the patch automatically included in the stable tree, add the tag Cc: stable@kernel.org in the sign-off area. Once the patch is merged it will be applied to the stable tree without anything else needing to be done by the author |
