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/linux (12 of 61 files). Show all

Unified · Split

12 files

include/uapi/linux/bpfilter.h +1 −1
include/uapi/linux/ipmi_bmc.h +1 −1
include/uapi/linux/isst_if.h +1 −1
include/uapi/linux/netfilter/nf_synproxy.h +1 −1
include/uapi/linux/psp-sev.h +1 −1
include/uapi/linux/rxrpc.h +1 −1
include/uapi/linux/usb/g_uvc.h +1 −1
include/uapi/linux/vbox_vmmdev_types.h +1 −1
include/uapi/linux/vboxguest.h +1 −1
include/uapi/linux/virtio_pmem.h +1 −1
include/uapi/linux/vmcore.h +1 −1
include/uapi/linux/wmi.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 */
2	2	#ifndef _UAPI_LINUX_BPFILTER_H
3	3	#define _UAPI_LINUX_BPFILTER_H
4	4

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 */
2	2	/*
3	3	* Copyright (c) 2015-2018, Intel Corporation.
4	4	*/

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 */
2	2	/*
3	3	* Intel Speed Select Interface: OS to hardware Interface
4	4	* 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 */
2	2	#ifndef _NF_SYNPROXY_H
3	3	#define _NF_SYNPROXY_H
4	4

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 */
2	2	/*
3	3	* Userspace interface for AMD Secure Encrypted Virtualization (SEV)
4	4	* 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 */
2	2	/* Types and definitions for AF_RXRPC.
3	3	*
4	4	* 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 */
2	2	/*
3	3	* g_uvc.h -- USB Video Class Gadget driver API
4	4	*

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) */
2	2	/*
3	3	* Virtual Device for Guest <-> VMM/Host communication, type definitions
4	4	* 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) */
2	2	/*
3	3	* VBoxGuest - VirtualBox Guest Additions Driver Interface.
4	4	*

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 */
2	2	/*
3	3	* Definitions for virtio-pmem devices.
4	4	*

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 */
2	2	#ifndef _UAPI_VMCORE_H
3	3	#define _UAPI_VMCORE_H
4	4

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 */
2	2	/*
3	3	* User API methods for ACPI-WMI mapping driver
4	4	*