aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/process
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-04-30 06:51:28 -0400
committerJonathan Corbet <corbet@lwn.net>2019-05-03 06:33:57 -0600
commit6132c37ca543d45cc911043fb17b2d86593fb612 (patch)
tree8cac0ea946ac8fa3e46499dc473d8ec1c92327f9 /Documentation/process
parentdocs/vm: Minor editorial changes in the THP and hugetlbfs (diff)
downloadlinux-dev-6132c37ca543d45cc911043fb17b2d86593fb612.tar.xz
linux-dev-6132c37ca543d45cc911043fb17b2d86593fb612.zip
docs: Don't reference the ZLib license in license-rules.rst
We never had a file called LICENSES/other/ZLib in the tree, so don't reference it. Instead mention the GPL v1 as an (bad) example. 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.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst
index 6b09033a8e9e..ade495fe6811 100644
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -255,9 +255,9 @@ kernel, can be broken down into:
Contains the Internet Systems Consortium license text and the required
metatags::
- LICENSES/other/ZLib
+ LICENSES/other/GPL-1.0
- Contains the ZLIB license text and the required metatags.
+ Contains the GPL version 1 license text and the required metatags.
Metatags: