[PATCH 3/3] LICENSES: Rename other to deprecated

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Make it clear in the directory name that these are not intended for new
code.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 Documentation/process/license-rules.rst     | 8 ++++----
 LICENSES/{other => deprecated}/GPL-1.0      | 0
 LICENSES/{other => deprecated}/ISC          | 0
 LICENSES/{other => deprecated}/Linux-OpenIB | 0
 LICENSES/{other => deprecated}/X11          | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename LICENSES/{other => deprecated}/GPL-1.0 (100%)
 rename LICENSES/{other => deprecated}/ISC (100%)
 rename LICENSES/{other => deprecated}/Linux-OpenIB (100%)
 rename LICENSES/{other => deprecated}/X11 (100%)

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
similarity index 100%
rename from LICENSES/other/GPL-1.0
rename to LICENSES/deprecated/GPL-1.0
diff --git a/LICENSES/other/ISC b/LICENSES/deprecated/ISC
similarity index 100%
rename from LICENSES/other/ISC
rename to LICENSES/deprecated/ISC
diff --git a/LICENSES/other/Linux-OpenIB b/LICENSES/deprecated/Linux-OpenIB
similarity index 100%
rename from LICENSES/other/Linux-OpenIB
rename to LICENSES/deprecated/Linux-OpenIB
diff --git a/LICENSES/other/X11 b/LICENSES/deprecated/X11
similarity index 100%
rename from LICENSES/other/X11
rename to LICENSES/deprecated/X11
-- 
2.20.1




[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux