History

Merge tag 'spdx-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

Pull SPDX fixes from Greg KH: "Here are some small SPDX fixes for 5.3-rc2 for things that came in during the 5.3-rc1 merge window that we previously missed. Only three small patches here: - two uapi patches to resolve some SPDX tags that were not correct - fix an invalid SPDX tag in the iomap Makefile file All have been properly reviewed on the public mailing lists" * tag 'spdx-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: iomap: fix Invalid License ID treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers

Linus Torvalds committed 7 years ago

Commit ad28fd12 parents 29af915 0ce38c561 files · +61 −61Browse files

Showing the changes to include/uapi (17 of 61 files). Show all

Unified · Split

17 files
  1. include/uapi/linux/bpfilter.h +1 −1
  2. include/uapi/linux/ipmi_bmc.h +1 −1
  3. include/uapi/linux/isst_if.h +1 −1
  4. include/uapi/linux/netfilter/nf_synproxy.h +1 −1
  5. include/uapi/linux/psp-sev.h +1 −1
  6. include/uapi/linux/rxrpc.h +1 −1
  7. include/uapi/linux/usb/g_uvc.h +1 −1
  8. include/uapi/linux/vbox_vmmdev_types.h +1 −1
  9. include/uapi/linux/vboxguest.h +1 −1
  10. include/uapi/linux/virtio_pmem.h +1 −1
  11. include/uapi/linux/vmcore.h +1 −1
  12. include/uapi/linux/wmi.h +1 −1
  13. include/uapi/misc/fastrpc.h +1 −1
  14. include/uapi/rdma/rvt-abi.h +1 −1
  15. include/uapi/rdma/siw-abi.h +1 −1
  16. include/uapi/scsi/scsi_bsg_ufs.h +1 −1
  17. include/uapi/sound/skl-tplg-interface.h +1 −1
include/uapi/linux/bpfilter.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef _UAPI_LINUX_BPFILTER_H
33 #define _UAPI_LINUX_BPFILTER_H
44
include/uapi/linux/ipmi_bmc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33 * Copyright (c) 2015-2018, Intel Corporation.
44 */
include/uapi/linux/isst_if.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33 * Intel Speed Select Interface: OS to hardware Interface
44 * Copyright (c) 2019, Intel Corporation.
include/uapi/linux/netfilter/nf_synproxy.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef _NF_SYNPROXY_H
33 #define _NF_SYNPROXY_H
44
include/uapi/linux/psp-sev.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0-only */
1+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
22 /*
33 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
44 * platform management commands.
include/uapi/linux/rxrpc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0-or-later */
1+/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
22 /* Types and definitions for AF_RXRPC.
33 *
44 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
include/uapi/linux/usb/g_uvc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0+ */
1+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
22 /*
33 * g_uvc.h -- USB Video Class Gadget driver API
44 *
include/uapi/linux/vbox_vmmdev_types.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
1+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
22 /*
33 * Virtual Device for Guest <-> VMM/Host communication, type definitions
44 * which are also used for the vboxguest ioctl interface / by vboxsf
include/uapi/linux/vboxguest.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
1+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
22 /*
33 * VBoxGuest - VirtualBox Guest Additions Driver Interface.
44 *
include/uapi/linux/virtio_pmem.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
1+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
22 /*
33 * Definitions for virtio-pmem devices.
44 *
include/uapi/linux/vmcore.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef _UAPI_VMCORE_H
33 #define _UAPI_VMCORE_H
44
include/uapi/linux/wmi.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0-only */
1+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
22 /*
33 * User API methods for ACPI-WMI mapping driver
44 *
include/uapi/misc/fastrpc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22
33 #ifndef __QCOM_FASTRPC_H__
44 #define __QCOM_FASTRPC_H__
include/uapi/rdma/rvt-abi.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
22
33 /*
44 * This file contains defines, structures, etc. that are used
include/uapi/rdma/siw-abi.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
1+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) or BSD-3-Clause */
22
33 /* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
44 /* Copyright (c) 2008-2019, IBM Corporation */
include/uapi/scsi/scsi_bsg_ufs.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33 * UFS Transport SGIO v4 BSG Message Support
44 *
include/uapi/sound/skl-tplg-interface.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33 * skl-tplg-interface.h - Intel DSP FW private data interface
44 *