aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/process
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-04-30 06:51:30 -0400
committerJonathan Corbet <corbet@lwn.net>2019-05-03 06:34:32 -0600
commit62be257e986dab439537b3e1c19ef746a13e1860 (patch)
treeb355d58fa30671b195ed24e86180bd3d156a0fc7 /Documentation/process
parentLICENSES: Clearly mark dual license only licenses (diff)
downloadlinux-dev-62be257e986dab439537b3e1c19ef746a13e1860.tar.xz
linux-dev-62be257e986dab439537b3e1c19ef746a13e1860.zip
LICENSES: Rename other to deprecated
Make it clear in the directory name that these are not intended for new code. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/process')
-rw-r--r--Documentation/process/license-rules.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst
index 507b695fa9da..2ef44ada3f11 100644
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -234,13 +234,13 @@ kernel, can be broken down into:
|
-2. Not recommended licenses:
+2. Deprecated licenses:
These licenses should only be used for existing code or for importing
code from a different project. These licenses are available from the
directory::
- LICENSES/other/
+ LICENSES/deprecated/
in the kernel source tree.
@@ -250,12 +250,12 @@ kernel, can be broken down into:
Examples::
- LICENSES/other/ISC
+ LICENSES/deprecated/ISC
Contains the Internet Systems Consortium license text and the required
metatags::
- LICENSES/other/GPL-1.0
+ LICENSES/deprecated/GPL-1.0
Contains the GPL version 1 license text and the required metatags.