diff options
| -rw-r--r-- | Documentation/process/license-rules.rst | 8 | ||||
| -rw-r--r-- | LICENSES/deprecated/GPL-1.0 (renamed from LICENSES/other/GPL-1.0) | 0 | ||||
| -rw-r--r-- | LICENSES/deprecated/ISC (renamed from LICENSES/other/ISC) | 0 | ||||
| -rw-r--r-- | LICENSES/deprecated/Linux-OpenIB (renamed from LICENSES/other/Linux-OpenIB) | 0 | ||||
| -rw-r--r-- | LICENSES/deprecated/X11 (renamed from LICENSES/other/X11) | 0 |
5 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. diff --git a/LICENSES/other/GPL-1.0 b/LICENSES/deprecated/GPL-1.0 index 3a4fa969e4c2..3a4fa969e4c2 100644 --- a/LICENSES/other/GPL-1.0 +++ b/LICENSES/deprecated/GPL-1.0 diff --git a/LICENSES/other/ISC b/LICENSES/deprecated/ISC index 8953c3142079..8953c3142079 100644 --- a/LICENSES/other/ISC +++ b/LICENSES/deprecated/ISC diff --git a/LICENSES/other/Linux-OpenIB b/LICENSES/deprecated/Linux-OpenIB index 1ad85f6b3a89..1ad85f6b3a89 100644 --- a/LICENSES/other/Linux-OpenIB +++ b/LICENSES/deprecated/Linux-OpenIB diff --git a/LICENSES/other/X11 b/LICENSES/deprecated/X11 index fe4353fd0000..fe4353fd0000 100644 --- a/LICENSES/other/X11 +++ b/LICENSES/deprecated/X11 |