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

Unified · Split

61 files
  1. arch/arm64/include/uapi/asm/bpf_perf_event.h +1 −1
  2. arch/csky/include/uapi/asm/byteorder.h +1 −1
  3. arch/csky/include/uapi/asm/cachectl.h +1 −1
  4. arch/csky/include/uapi/asm/perf_regs.h +1 −1
  5. arch/csky/include/uapi/asm/ptrace.h +1 −1
  6. arch/csky/include/uapi/asm/sigcontext.h +1 −1
  7. arch/csky/include/uapi/asm/unistd.h +1 −1
  8. arch/nds32/include/uapi/asm/auxvec.h +1 −1
  9. arch/nds32/include/uapi/asm/byteorder.h +1 −1
  10. arch/nds32/include/uapi/asm/cachectl.h +1 −1
  11. arch/nds32/include/uapi/asm/fp_udfiex_crtl.h +1 −1
  12. arch/nds32/include/uapi/asm/param.h +1 −1
  13. arch/nds32/include/uapi/asm/ptrace.h +1 −1
  14. arch/nds32/include/uapi/asm/sigcontext.h +1 −1
  15. arch/nds32/include/uapi/asm/unistd.h +1 −1
  16. arch/powerpc/include/uapi/asm/bpf_perf_event.h +1 −1
  17. arch/riscv/include/uapi/asm/auxvec.h +1 −1
  18. arch/riscv/include/uapi/asm/bitsperlong.h +1 −1
  19. arch/riscv/include/uapi/asm/byteorder.h +1 −1
  20. arch/riscv/include/uapi/asm/hwcap.h +1 −1
  21. arch/riscv/include/uapi/asm/ptrace.h +1 −1
  22. arch/riscv/include/uapi/asm/sigcontext.h +1 −1
  23. arch/riscv/include/uapi/asm/ucontext.h +1 −1
  24. arch/s390/include/uapi/asm/bpf_perf_event.h +1 −1
  25. arch/s390/include/uapi/asm/ipl.h +1 −1
  26. arch/sh/include/uapi/asm/setup.h +1 −1
  27. arch/sh/include/uapi/asm/types.h +1 −1
  28. arch/sparc/include/uapi/asm/oradax.h +1 −1
  29. arch/x86/include/uapi/asm/byteorder.h +1 −1
  30. arch/x86/include/uapi/asm/hwcap2.h +1 −1
  31. arch/x86/include/uapi/asm/sigcontext32.h +1 −1
  32. arch/x86/include/uapi/asm/types.h +1 −1
  33. fs/iomap/Makefile +1 −1
  34. include/sound/sof/control.h +1 −1
  35. include/sound/sof/dai-intel.h +1 −1
  36. include/sound/sof/dai.h +1 −1
  37. include/sound/sof/header.h +1 −1
  38. include/sound/sof/info.h +1 −1
  39. include/sound/sof/pm.h +1 −1
  40. include/sound/sof/stream.h +1 −1
  41. include/sound/sof/topology.h +1 −1
  42. include/sound/sof/trace.h +1 −1
  43. include/sound/sof/xtensa.h +1 −1
  44. include/uapi/linux/bpfilter.h +1 −1
  45. include/uapi/linux/ipmi_bmc.h +1 −1
  46. include/uapi/linux/isst_if.h +1 −1
  47. include/uapi/linux/netfilter/nf_synproxy.h +1 −1
  48. include/uapi/linux/psp-sev.h +1 −1
  49. include/uapi/linux/rxrpc.h +1 −1
  50. include/uapi/linux/usb/g_uvc.h +1 −1
  51. include/uapi/linux/vbox_vmmdev_types.h +1 −1
  52. include/uapi/linux/vboxguest.h +1 −1
  53. include/uapi/linux/virtio_pmem.h +1 −1
  54. include/uapi/linux/vmcore.h +1 −1
  55. include/uapi/linux/wmi.h +1 −1
  56. include/uapi/misc/fastrpc.h +1 −1
  57. include/uapi/rdma/rvt-abi.h +1 −1
  58. include/uapi/rdma/siw-abi.h +1 −1
  59. include/uapi/scsi/scsi_bsg_ufs.h +1 −1
  60. include/uapi/sound/skl-tplg-interface.h +1 −1
  61. samples/vfio-mdev/mdpy-defs.h +1 −1
arch/arm64/include/uapi/asm/bpf_perf_event.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__ASM_BPF_PERF_EVENT_H__
33 #define _UAPI__ASM_BPF_PERF_EVENT_H__
44
arch/csky/include/uapi/asm/byteorder.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 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
33
44 #ifndef __ASM_CSKY_BYTEORDER_H
arch/csky/include/uapi/asm/cachectl.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 __ASM_CSKY_CACHECTL_H
44 #define __ASM_CSKY_CACHECTL_H
arch/csky/include/uapi/asm/perf_regs.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 // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
33
44 #ifndef _ASM_CSKY_PERF_REGS_H
arch/csky/include/uapi/asm/ptrace.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 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
33
44 #ifndef _CSKY_PTRACE_H
arch/csky/include/uapi/asm/sigcontext.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 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
33
44 #ifndef __ASM_CSKY_SIGCONTEXT_H
arch/csky/include/uapi/asm/unistd.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 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
33
44 #define __ARCH_WANT_SYS_CLONE
arch/nds32/include/uapi/asm/auxvec.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 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #ifndef __ASM_AUXVEC_H
arch/nds32/include/uapi/asm/byteorder.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 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #ifndef __NDS32_BYTEORDER_H__
arch/nds32/include/uapi/asm/cachectl.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 // Copyright (C) 1994, 1995, 1996 by Ralf Baechle
33 // Copyright (C) 2005-2017 Andes Technology Corporation
44 #ifndef _ASM_CACHECTL
arch/nds32/include/uapi/asm/fp_udfiex_crtl.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 /* Copyright (C) 2005-2019 Andes Technology Corporation */
33 #ifndef _FP_UDF_IEX_CRTL_H
44 #define _FP_UDF_IEX_CRTL_H
arch/nds32/include/uapi/asm/param.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 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #ifndef __ASM_NDS32_PARAM_H
arch/nds32/include/uapi/asm/ptrace.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 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #ifndef __UAPI_ASM_NDS32_PTRACE_H
arch/nds32/include/uapi/asm/sigcontext.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 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #ifndef _ASMNDS32_SIGCONTEXT_H
arch/nds32/include/uapi/asm/unistd.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 // Copyright (C) 2005-2017 Andes Technology Corporation
33
44 #define __ARCH_WANT_STAT64
arch/powerpc/include/uapi/asm/bpf_perf_event.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__ASM_BPF_PERF_EVENT_H__
33 #define _UAPI__ASM_BPF_PERF_EVENT_H__
44
arch/riscv/include/uapi/asm/auxvec.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 * Copyright (C) 2012 ARM Ltd.
44 * Copyright (C) 2015 Regents of the University of California
arch/riscv/include/uapi/asm/bitsperlong.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 * Copyright (C) 2012 ARM Ltd.
44 * Copyright (C) 2015 Regents of the University of California
arch/riscv/include/uapi/asm/byteorder.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 * Copyright (C) 2012 ARM Ltd.
44 * Copyright (C) 2015 Regents of the University of California
arch/riscv/include/uapi/asm/hwcap.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 * Copied from arch/arm64/include/asm/hwcap.h
44 *
arch/riscv/include/uapi/asm/ptrace.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 * Copyright (C) 2012 Regents of the University of California
44 */
arch/riscv/include/uapi/asm/sigcontext.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 * Copyright (C) 2012 Regents of the University of California
44 */
arch/riscv/include/uapi/asm/ucontext.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 * Copyright (C) 2012 ARM Ltd.
44 * Copyright (C) 2017 SiFive, Inc.
arch/s390/include/uapi/asm/bpf_perf_event.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__ASM_BPF_PERF_EVENT_H__
33 #define _UAPI__ASM_BPF_PERF_EVENT_H__
44
arch/s390/include/uapi/asm/ipl.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 _ASM_S390_UAPI_IPL_H
33 #define _ASM_S390_UAPI_IPL_H
44
arch/sh/include/uapi/asm/setup.h+1−1
@@ -1,2 +1,2 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #include <asm-generic/setup.h>
arch/sh/include/uapi/asm/types.h+1−1
@@ -1,2 +1,2 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #include <asm-generic/types.h>
arch/sparc/include/uapi/asm/oradax.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 /*
33 * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
44 */
arch/x86/include/uapi/asm/byteorder.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 _ASM_X86_BYTEORDER_H
33 #define _ASM_X86_BYTEORDER_H
44
arch/x86/include/uapi/asm/hwcap2.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 _ASM_X86_HWCAP2_H
33 #define _ASM_X86_HWCAP2_H
44
arch/x86/include/uapi/asm/sigcontext32.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 _ASM_X86_SIGCONTEXT32_H
33 #define _ASM_X86_SIGCONTEXT32_H
44
arch/x86/include/uapi/asm/types.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 _ASM_X86_TYPES_H
33 #define _ASM_X86_TYPES_H
44
fs/iomap/Makefile+1−1
@@ -1,4 +1,4 @@
1−# SPDX-License-Identifier: GPL-2.0-or-newer
1+# SPDX-License-Identifier: GPL-2.0-or-later
22 #
33 # Copyright (c) 2019 Oracle.
44 # All Rights Reserved.
include/sound/sof/control.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/dai-intel.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/dai.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/header.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/info.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/pm.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/stream.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/topology.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/trace.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
include/sound/sof/xtensa.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
1+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
22 /*
33 * This file is provided under a dual BSD/GPLv2 license. When using or
44 * redistributing this file, you may do so under either license.
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 *
samples/vfio-mdev/mdpy-defs.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1+/* SPDX-License-Identifier: GPL-2.0 */
22 /*
33 * Simple pci display device.
44 *