diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 12:42:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 12:42:50 -0700 |
commit | 8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf (patch) | |
tree | 0d7fca2a5fb43fa75b51c4cdaaee493e44d56d62 /LICENSES | |
parent | 2646719a48c21ba0cae82a3f57382a9573fd8400 (diff) | |
parent | d9defe448f4c7b88ca2ae636a321ef8970fa718d (diff) | |
download | linux-8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf.tar.bz2 |
Merge tag 'docs-5.2' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"A reasonably busy cycle for docs, including:
- Lots of work on the Chinese and Italian translations
- Some license-rules clarifications from Christoph
- Various build-script fixes
- A new document on memory models
- RST conversion of the live-patching docs
- The usual collection of typo fixes and corrections"
* tag 'docs-5.2' of git://git.lwn.net/linux: (140 commits)
docs/livepatch: Unify style of livepatch documentation in the ReST format
docs: livepatch: convert docs to ReST and rename to *.rst
scripts/documentation-file-ref-check: detect broken :doc:`foo`
scripts/documentation-file-ref-check: don't parse Next/ dir
LICENSES: Rename other to deprecated
LICENSES: Clearly mark dual license only licenses
docs: Don't reference the ZLib license in license-rules.rst
docs/vm: Minor editorial changes in the THP and hugetlbfs
docs/vm: add documentation of memory models
doc:it_IT: translation alignment
doc: fix typo in PGP guide
dontdiff: update with Kconfig build artifacts
docs/zh_CN: fix typos in 1.Intro.rst file
docs/zh_CN: redirect CoC docs to Chinese version
doc: mm: migration doesn't use FOLL_SPLIT anymore
docs: doc-guide: remove the extension from .rst files
doc: kselftest: Fix KBUILD_OUTPUT usage instructions
docs: trace: fix some Sphinx warnings
docs: speculation.txt: mark example blocks as such
docs: ntb.txt: add blank lines to clean up some Sphinx warnings
...
Diffstat (limited to 'LICENSES')
-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 | ||||
-rw-r--r-- | LICENSES/dual/Apache-2.0 (renamed from LICENSES/other/Apache-2.0) | 4 | ||||
-rw-r--r-- | LICENSES/dual/CDDL-1.0 (renamed from LICENSES/other/CDDL-1.0) | 4 | ||||
-rw-r--r-- | LICENSES/dual/MPL-1.1 (renamed from LICENSES/other/MPL-1.1) | 4 |
7 files changed, 10 insertions, 2 deletions
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 diff --git a/LICENSES/other/Apache-2.0 b/LICENSES/dual/Apache-2.0 index 7cd903f573e5..6e89ddeab187 100644 --- a/LICENSES/other/Apache-2.0 +++ b/LICENSES/dual/Apache-2.0 @@ -1,6 +1,10 @@ Valid-License-Identifier: Apache-2.0 SPDX-URL: https://spdx.org/licenses/Apache-2.0.html Usage-Guide: + Do NOT use. The Apache-2.0 is not GPL2 compatible. It may only be used + for dual-licensed files where the other license is GPL2 compatible. + If you end up using this it MUST be used together with a GPL2 compatible + license using "OR". To use the Apache License version 2.0 put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: diff --git a/LICENSES/other/CDDL-1.0 b/LICENSES/dual/CDDL-1.0 index 25f614276ddd..b0ca1016db79 100644 --- a/LICENSES/other/CDDL-1.0 +++ b/LICENSES/dual/CDDL-1.0 @@ -1,8 +1,8 @@ Valid-License-Identifier: CDDL-1.0 SPDX-URL: https://spdx.org/licenses/CDDL-1.0.html Usage-Guide: - Do NOT use. The CDDL-1.0 is not GPL compatible. It may only be used for - dual-licensed files where the other license is GPL compatible. + Do NOT use. The CDDL-1.0 is not GPL2 compatible. It may only be used for + dual-licensed files where the other license is GPL2 compatible. If you end up using this it MUST be used together with a GPL2 compatible license using "OR". To use the Common Development and Distribution License 1.0 put the diff --git a/LICENSES/other/MPL-1.1 b/LICENSES/dual/MPL-1.1 index 568b6049efe6..61706859e1b2 100644 --- a/LICENSES/other/MPL-1.1 +++ b/LICENSES/dual/MPL-1.1 @@ -1,6 +1,10 @@ Valid-License-Identifier: MPL-1.1 SPDX-URL: https://spdx.org/licenses/MPL-1.1.html Usage-Guide: + Do NOT use. The MPL-1.1 is not GPL2 compatible. It may only be used for + dual-licensed files where the other license is GPL2 compatible. + If you end up using this it MUST be used together with a GPL2 compatible + license using "OR". To use the Mozilla Public License version 1.1 put the following SPDX tag/value pair into a comment according to the placement guidelines in the licensing rules documentation: |