aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSES/other
AgeCommit message (Collapse)Author
2018-10-24Merge tag 'docs-4.20' of git://git.lwn.net/linuxLinus Torvalds
Pull documentation updates from Jonathan Corbet: "This is a fairly typical cycle for documentation. There's some welcome readability improvements for the formatted output, some LICENSES updates including the addition of the ISC license, the removal of the unloved and unmaintained 00-INDEX files, the deprecated APIs document from Kees, more MM docs from Mike Rapoport, and the usual pile of typo fixes and corrections" * tag 'docs-4.20' of git://git.lwn.net/linux: (41 commits) docs: Fix typos in histogram.rst docs: Introduce deprecated APIs list kernel-doc: fix declaration type determination doc: fix a typo in adding-syscalls.rst docs/admin-guide: memory-hotplug: remove table of contents doc: printk-formats: Remove bogus kobject references for device nodes Documentation: preempt-locking: Use better example dm flakey: Document "error_writes" feature docs/completion.txt: Fix a couple of punctuation nits LICENSES: Add ISC license text LICENSES: Add note to CDDL-1.0 license that it should not be used docs/core-api: memory-hotplug: add some details about locking internals docs/core-api: rename memory-hotplug-notifier to memory-hotplug docs: improve readability for people with poorer eyesight yama: clarify ptrace_scope=2 in Yama documentation docs/vm: split memory hotplug notifier description to Documentation/core-api docs: move memory hotplug description into admin-guide/mm doc: Fix acronym "FEKEK" in ecryptfs docs: fix some broken documentation references iommu: Fix passthrough option documentation ...
2018-10-18LICENSES: Remove CC-BY-SA-4.0 license textChristoph Hellwig
Using non-GPL licenses for our documentation is rather problematic, as it can directly include other files, which generally are GPLv2 licensed and thus not compatible. Remove this license now that the only user (idr.rst) is gone to avoid people semi-accidentally using it again. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-10-12LICENSES: Add ISC license textHans de Goede
Add the full text of the ISC license to the kernel tree. It was copied directly from: https://spdx.org/licenses/ISC.html With the mention of "ISC" in the warranty disclaimer replaced with "THE AUTHOR" as done in the ISC license headers used in the ath10k and brcmfmac wifi drivers. Cc: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-10-12LICENSES: Add note to CDDL-1.0 license that it should not be usedHans de Goede
The only reason we have the CDDL-1.0 license text around is for some dual-licensed files from virtualbox. New code should not use this license. Add a note about this and change the example tag to be dual-licensed. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-04-27LICENSES: Add Linux-OpenIB license textThomas Gleixner
The infiniband code uses a variant of the OpenIB license. This license is BSD-2-Clause with the MIT disclaimer. The linux kernel uses this license extensively throughout the driver subsystem since 2005. Note that the OpenIB.org license is a true match to BSD-2-Clause. The license text was copied from: https://spdx.org/licenses/Linux-OpenIB.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-04-27LICENSES: Add CC-BY-SA-4.0 license textThomas Gleixner
Add the full text of the CC-BY-SA-4.0 license to the kernel tree. It was copied directly from: https://spdx.org/licenses/CC-BY-SA-4.0.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-04-27LICENSES: Add CDDL-1.0 license textThomas Gleixner
Add the full text of the CDDL-1.0 to the kernel tree. It was copied directly from: https://spdx.org/licenses/CDDL-1.0.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-04-27LICENSES: Add Apache 2.0 license textThomas Gleixner
Add the full text of the Apache License version 2 to the kernel tree. It was copied directly from: https://spdx.org/licenses/Apache-2.0.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-04-27LICENSES: Add X11 licenseThomas Gleixner
Add the full text of the X11 to the kernel tree. It was copied directly from: https://spdx.org/licenses/X11.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-01-06LICENSES: Add MPL-1.1 licenseThomas Gleixner
Add the full text of the Mozilla Public License 1.1 to the kernel tree. It was copied directly from: https://spdx.org/licenses/MPL-1.1.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
2018-01-06LICENSES: Add the GPL 1.0 licenseThomas Gleixner
Add the full text of the GPL 1.0 license to the kernel tree. It was copied directly from: https://spdx.org/licenses/GPL-1.0.html#licenseText Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>