linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers
@ 2019-07-25  7:58 Masahiro Yamada
  2019-07-25  7:58 ` [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again Masahiro Yamada
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Masahiro Yamada @ 2019-07-25  7:58 UTC (permalink / raw)
  To: linux-kernel, linux-spdx, Greg KH
  Cc: Thomas Gleixner, alsa-devel, Masahiro Yamada

UAPI headers licensed under GPL are supposed to have exception
"WITH Linux-syscall-note" so that they can be included into non-GPL
user space application code.

The exception note is missing in some UAPI headers.

Some of them slipped in by the treewide conversion commit b24413180f56
("License cleanup: add SPDX GPL-2.0 license identifier to files with
no license"). Just run:

  $ git show --oneline b24413180f56 -- arch/x86/include/uapi/asm/

I believe they are not intentional, and should be fixed too.

This patch was generated by the following script:

  git grep -l --not -e Linux-syscall-note --and -e SPDX-License-Identifier \
    -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild |
  while read file
  do
          sed -i -e '/[[:space:]]OR[[:space:]]/s/\(GPL-[^[:space:]]*\)/(\1 WITH Linux-syscall-note)/g' \
          -e '/[[:space:]]or[[:space:]]/s/\(GPL-[^[:space:]]*\)/(\1 WITH Linux-syscall-note)/g' \
          -e '/[[:space:]]OR[[:space:]]/!{/[[:space:]]or[[:space:]]/!s/\(GPL-[^[:space:]]*\)/\1 WITH Linux-syscall-note/g}' $file
  done

After this patch is applied, there are 5 UAPI headers that do not contain
"WITH Linux-syscall-note". They are kept untouched since this exception
applies only to GPL variants.

  $ git grep --not -e Linux-syscall-note --and -e SPDX-License-Identifier \
    -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild
  include/uapi/drm/panfrost_drm.h:/* SPDX-License-Identifier: MIT */
  include/uapi/linux/batman_adv.h:/* SPDX-License-Identifier: MIT */
  include/uapi/linux/qemu_fw_cfg.h:/* SPDX-License-Identifier: BSD-3-Clause */
  include/uapi/linux/vbox_err.h:/* SPDX-License-Identifier: MIT */
  include/uapi/linux/virtio_iommu.h:/* SPDX-License-Identifier: BSD-3-Clause */

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Fix missing parentheses

 arch/arm64/include/uapi/asm/bpf_perf_event.h   | 2 +-
 arch/csky/include/uapi/asm/byteorder.h         | 2 +-
 arch/csky/include/uapi/asm/cachectl.h          | 2 +-
 arch/csky/include/uapi/asm/perf_regs.h         | 2 +-
 arch/csky/include/uapi/asm/ptrace.h            | 2 +-
 arch/csky/include/uapi/asm/sigcontext.h        | 2 +-
 arch/csky/include/uapi/asm/unistd.h            | 2 +-
 arch/nds32/include/uapi/asm/auxvec.h           | 2 +-
 arch/nds32/include/uapi/asm/byteorder.h        | 2 +-
 arch/nds32/include/uapi/asm/cachectl.h         | 2 +-
 arch/nds32/include/uapi/asm/fp_udfiex_crtl.h   | 2 +-
 arch/nds32/include/uapi/asm/param.h            | 2 +-
 arch/nds32/include/uapi/asm/ptrace.h           | 2 +-
 arch/nds32/include/uapi/asm/sigcontext.h       | 2 +-
 arch/nds32/include/uapi/asm/unistd.h           | 2 +-
 arch/powerpc/include/uapi/asm/bpf_perf_event.h | 2 +-
 arch/riscv/include/uapi/asm/auxvec.h           | 2 +-
 arch/riscv/include/uapi/asm/bitsperlong.h      | 2 +-
 arch/riscv/include/uapi/asm/byteorder.h        | 2 +-
 arch/riscv/include/uapi/asm/hwcap.h            | 2 +-
 arch/riscv/include/uapi/asm/ptrace.h           | 2 +-
 arch/riscv/include/uapi/asm/sigcontext.h       | 2 +-
 arch/riscv/include/uapi/asm/ucontext.h         | 2 +-
 arch/s390/include/uapi/asm/bpf_perf_event.h    | 2 +-
 arch/s390/include/uapi/asm/ipl.h               | 2 +-
 arch/sh/include/uapi/asm/setup.h               | 2 +-
 arch/sh/include/uapi/asm/types.h               | 2 +-
 arch/sparc/include/uapi/asm/oradax.h           | 2 +-
 arch/x86/include/uapi/asm/byteorder.h          | 2 +-
 arch/x86/include/uapi/asm/hwcap2.h             | 2 +-
 arch/x86/include/uapi/asm/sigcontext32.h       | 2 +-
 arch/x86/include/uapi/asm/types.h              | 2 +-
 include/uapi/linux/bpfilter.h                  | 2 +-
 include/uapi/linux/ipmi_bmc.h                  | 2 +-
 include/uapi/linux/isst_if.h                   | 2 +-
 include/uapi/linux/netfilter/nf_synproxy.h     | 2 +-
 include/uapi/linux/psp-sev.h                   | 2 +-
 include/uapi/linux/rxrpc.h                     | 2 +-
 include/uapi/linux/usb/g_uvc.h                 | 2 +-
 include/uapi/linux/vbox_vmmdev_types.h         | 2 +-
 include/uapi/linux/vboxguest.h                 | 2 +-
 include/uapi/linux/virtio_pmem.h               | 2 +-
 include/uapi/linux/vmcore.h                    | 2 +-
 include/uapi/linux/wmi.h                       | 2 +-
 include/uapi/misc/fastrpc.h                    | 2 +-
 include/uapi/rdma/rvt-abi.h                    | 2 +-
 include/uapi/rdma/siw-abi.h                    | 2 +-
 include/uapi/scsi/scsi_bsg_ufs.h               | 2 +-
 include/uapi/sound/skl-tplg-interface.h        | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/arch/arm64/include/uapi/asm/bpf_perf_event.h b/arch/arm64/include/uapi/asm/bpf_perf_event.h
index b551b741653d..5e1e648aeec4 100644
--- a/arch/arm64/include/uapi/asm/bpf_perf_event.h
+++ b/arch/arm64/include/uapi/asm/bpf_perf_event.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
 #define _UAPI__ASM_BPF_PERF_EVENT_H__
 
diff --git a/arch/csky/include/uapi/asm/byteorder.h b/arch/csky/include/uapi/asm/byteorder.h
index b079ec715cdf..d150cd664873 100644
--- a/arch/csky/include/uapi/asm/byteorder.h
+++ b/arch/csky/include/uapi/asm/byteorder.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
 
 #ifndef __ASM_CSKY_BYTEORDER_H
diff --git a/arch/csky/include/uapi/asm/cachectl.h b/arch/csky/include/uapi/asm/cachectl.h
index ddf2f39aa925..ed7fad1ea20d 100644
--- a/arch/csky/include/uapi/asm/cachectl.h
+++ b/arch/csky/include/uapi/asm/cachectl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
 #ifndef __ASM_CSKY_CACHECTL_H
 #define __ASM_CSKY_CACHECTL_H
diff --git a/arch/csky/include/uapi/asm/perf_regs.h b/arch/csky/include/uapi/asm/perf_regs.h
index ee323d818592..49d4e147a559 100644
--- a/arch/csky/include/uapi/asm/perf_regs.h
+++ b/arch/csky/include/uapi/asm/perf_regs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
 
 #ifndef _ASM_CSKY_PERF_REGS_H
diff --git a/arch/csky/include/uapi/asm/ptrace.h b/arch/csky/include/uapi/asm/ptrace.h
index 4e248d5b86ef..66b2268e324e 100644
--- a/arch/csky/include/uapi/asm/ptrace.h
+++ b/arch/csky/include/uapi/asm/ptrace.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
 
 #ifndef _CSKY_PTRACE_H
diff --git a/arch/csky/include/uapi/asm/sigcontext.h b/arch/csky/include/uapi/asm/sigcontext.h
index e81e7ff11e36..670c020f2cb8 100644
--- a/arch/csky/include/uapi/asm/sigcontext.h
+++ b/arch/csky/include/uapi/asm/sigcontext.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
 
 #ifndef __ASM_CSKY_SIGCONTEXT_H
diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h
index ec60e49cea66..211c983c7282 100644
--- a/arch/csky/include/uapi/asm/unistd.h
+++ b/arch/csky/include/uapi/asm/unistd.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
 
 #define __ARCH_WANT_SYS_CLONE
diff --git a/arch/nds32/include/uapi/asm/auxvec.h b/arch/nds32/include/uapi/asm/auxvec.h
index b5d58ea8decb..bc0b92ab8c15 100644
--- a/arch/nds32/include/uapi/asm/auxvec.h
+++ b/arch/nds32/include/uapi/asm/auxvec.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2005-2017 Andes Technology Corporation
 
 #ifndef __ASM_AUXVEC_H
diff --git a/arch/nds32/include/uapi/asm/byteorder.h b/arch/nds32/include/uapi/asm/byteorder.h
index 511e653c709d..c264ef12c49c 100644
--- a/arch/nds32/include/uapi/asm/byteorder.h
+++ b/arch/nds32/include/uapi/asm/byteorder.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2005-2017 Andes Technology Corporation
 
 #ifndef __NDS32_BYTEORDER_H__
diff --git a/arch/nds32/include/uapi/asm/cachectl.h b/arch/nds32/include/uapi/asm/cachectl.h
index 73793662815c..31b9b439d819 100644
--- a/arch/nds32/include/uapi/asm/cachectl.h
+++ b/arch/nds32/include/uapi/asm/cachectl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 1994, 1995, 1996 by Ralf Baechle
 // Copyright (C) 2005-2017 Andes Technology Corporation
 #ifndef	_ASM_CACHECTL
diff --git a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h
index d54a5d6c6538..f17396db16ec 100644
--- a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h
+++ b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (C) 2005-2019 Andes Technology Corporation */
 #ifndef	_FP_UDF_IEX_CRTL_H
 #define	_FP_UDF_IEX_CRTL_H
diff --git a/arch/nds32/include/uapi/asm/param.h b/arch/nds32/include/uapi/asm/param.h
index 2977534a6bd3..48d00328d328 100644
--- a/arch/nds32/include/uapi/asm/param.h
+++ b/arch/nds32/include/uapi/asm/param.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2005-2017 Andes Technology Corporation
 
 #ifndef __ASM_NDS32_PARAM_H
diff --git a/arch/nds32/include/uapi/asm/ptrace.h b/arch/nds32/include/uapi/asm/ptrace.h
index 1a6e01c00e6f..d76217c7c010 100644
--- a/arch/nds32/include/uapi/asm/ptrace.h
+++ b/arch/nds32/include/uapi/asm/ptrace.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2005-2017 Andes Technology Corporation
 
 #ifndef __UAPI_ASM_NDS32_PTRACE_H
diff --git a/arch/nds32/include/uapi/asm/sigcontext.h b/arch/nds32/include/uapi/asm/sigcontext.h
index dc89af7ddcc3..6c1e6648878f 100644
--- a/arch/nds32/include/uapi/asm/sigcontext.h
+++ b/arch/nds32/include/uapi/asm/sigcontext.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2005-2017 Andes Technology Corporation
 
 #ifndef _ASMNDS32_SIGCONTEXT_H
diff --git a/arch/nds32/include/uapi/asm/unistd.h b/arch/nds32/include/uapi/asm/unistd.h
index a0b2f7b9c0f2..410795e280fe 100644
--- a/arch/nds32/include/uapi/asm/unistd.h
+++ b/arch/nds32/include/uapi/asm/unistd.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 // Copyright (C) 2005-2017 Andes Technology Corporation
 
 #define __ARCH_WANT_STAT64
diff --git a/arch/powerpc/include/uapi/asm/bpf_perf_event.h b/arch/powerpc/include/uapi/asm/bpf_perf_event.h
index b551b741653d..5e1e648aeec4 100644
--- a/arch/powerpc/include/uapi/asm/bpf_perf_event.h
+++ b/arch/powerpc/include/uapi/asm/bpf_perf_event.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
 #define _UAPI__ASM_BPF_PERF_EVENT_H__
 
diff --git a/arch/riscv/include/uapi/asm/auxvec.h b/arch/riscv/include/uapi/asm/auxvec.h
index 62716653554b..d86cb17bbabe 100644
--- a/arch/riscv/include/uapi/asm/auxvec.h
+++ b/arch/riscv/include/uapi/asm/auxvec.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  * Copyright (C) 2015 Regents of the University of California
diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h
index 0b9b58b57ff6..7d0b32e3b701 100644
--- a/arch/riscv/include/uapi/asm/bitsperlong.h
+++ b/arch/riscv/include/uapi/asm/bitsperlong.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  * Copyright (C) 2015 Regents of the University of California
diff --git a/arch/riscv/include/uapi/asm/byteorder.h b/arch/riscv/include/uapi/asm/byteorder.h
index 1920debc09c0..f671e16bf6af 100644
--- a/arch/riscv/include/uapi/asm/byteorder.h
+++ b/arch/riscv/include/uapi/asm/byteorder.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  * Copyright (C) 2015 Regents of the University of California
diff --git a/arch/riscv/include/uapi/asm/hwcap.h b/arch/riscv/include/uapi/asm/hwcap.h
index 7d786145183b..4e7646077056 100644
--- a/arch/riscv/include/uapi/asm/hwcap.h
+++ b/arch/riscv/include/uapi/asm/hwcap.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copied from arch/arm64/include/asm/hwcap.h
  *
diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h
index 92d8f7cd8f84..882547f6bd5c 100644
--- a/arch/riscv/include/uapi/asm/ptrace.h
+++ b/arch/riscv/include/uapi/asm/ptrace.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 Regents of the University of California
  */
diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h
index 053f809e52ce..84f2dfcfdbce 100644
--- a/arch/riscv/include/uapi/asm/sigcontext.h
+++ b/arch/riscv/include/uapi/asm/sigcontext.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 Regents of the University of California
  */
diff --git a/arch/riscv/include/uapi/asm/ucontext.h b/arch/riscv/include/uapi/asm/ucontext.h
index b58e00cee2ec..411dd7b52ed6 100644
--- a/arch/riscv/include/uapi/asm/ucontext.h
+++ b/arch/riscv/include/uapi/asm/ucontext.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  * Copyright (C) 2017 SiFive, Inc.
diff --git a/arch/s390/include/uapi/asm/bpf_perf_event.h b/arch/s390/include/uapi/asm/bpf_perf_event.h
index cefe7c7cd4f6..3ed42ff6da94 100644
--- a/arch/s390/include/uapi/asm/bpf_perf_event.h
+++ b/arch/s390/include/uapi/asm/bpf_perf_event.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
 #define _UAPI__ASM_BPF_PERF_EVENT_H__
 
diff --git a/arch/s390/include/uapi/asm/ipl.h b/arch/s390/include/uapi/asm/ipl.h
index fd32b1cd80d2..451ba7d08905 100644
--- a/arch/s390/include/uapi/asm/ipl.h
+++ b/arch/s390/include/uapi/asm/ipl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_S390_UAPI_IPL_H
 #define _ASM_S390_UAPI_IPL_H
 
diff --git a/arch/sh/include/uapi/asm/setup.h b/arch/sh/include/uapi/asm/setup.h
index 1170dd2fb998..4bd19f80f9b0 100644
--- a/arch/sh/include/uapi/asm/setup.h
+++ b/arch/sh/include/uapi/asm/setup.h
@@ -1,2 +1,2 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/setup.h>
diff --git a/arch/sh/include/uapi/asm/types.h b/arch/sh/include/uapi/asm/types.h
index f83795fdc0da..68100e108ea6 100644
--- a/arch/sh/include/uapi/asm/types.h
+++ b/arch/sh/include/uapi/asm/types.h
@@ -1,2 +1,2 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/types.h>
diff --git a/arch/sparc/include/uapi/asm/oradax.h b/arch/sparc/include/uapi/asm/oradax.h
index 64c67f2ea33f..0dace69058ab 100644
--- a/arch/sparc/include/uapi/asm/oradax.h
+++ b/arch/sparc/include/uapi/asm/oradax.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
 /*
  * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
diff --git a/arch/x86/include/uapi/asm/byteorder.h b/arch/x86/include/uapi/asm/byteorder.h
index 484e3cfd7ef2..149143cab9ff 100644
--- a/arch/x86/include/uapi/asm/byteorder.h
+++ b/arch/x86/include/uapi/asm/byteorder.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_BYTEORDER_H
 #define _ASM_X86_BYTEORDER_H
 
diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h
index 6ebaae90e207..8b2effe6efb8 100644
--- a/arch/x86/include/uapi/asm/hwcap2.h
+++ b/arch/x86/include/uapi/asm/hwcap2.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_HWCAP2_H
 #define _ASM_X86_HWCAP2_H
 
diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h
index 6b18e88de8a6..7114801d0499 100644
--- a/arch/x86/include/uapi/asm/sigcontext32.h
+++ b/arch/x86/include/uapi/asm/sigcontext32.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_SIGCONTEXT32_H
 #define _ASM_X86_SIGCONTEXT32_H
 
diff --git a/arch/x86/include/uapi/asm/types.h b/arch/x86/include/uapi/asm/types.h
index df55e1ddb0c9..9d5c11a24279 100644
--- a/arch/x86/include/uapi/asm/types.h
+++ b/arch/x86/include/uapi/asm/types.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_TYPES_H
 #define _ASM_X86_TYPES_H
 
diff --git a/include/uapi/linux/bpfilter.h b/include/uapi/linux/bpfilter.h
index 2ec3cc99ea4c..cbc1f5813f50 100644
--- a/include/uapi/linux/bpfilter.h
+++ b/include/uapi/linux/bpfilter.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_BPFILTER_H
 #define _UAPI_LINUX_BPFILTER_H
 
diff --git a/include/uapi/linux/ipmi_bmc.h b/include/uapi/linux/ipmi_bmc.h
index 1670f0944227..782a03eb1086 100644
--- a/include/uapi/linux/ipmi_bmc.h
+++ b/include/uapi/linux/ipmi_bmc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2015-2018, Intel Corporation.
  */
diff --git a/include/uapi/linux/isst_if.h b/include/uapi/linux/isst_if.h
index d10b832c58c5..0a52b7b093d3 100644
--- a/include/uapi/linux/isst_if.h
+++ b/include/uapi/linux/isst_if.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Intel Speed Select Interface: OS to hardware Interface
  * Copyright (c) 2019, Intel Corporation.
diff --git a/include/uapi/linux/netfilter/nf_synproxy.h b/include/uapi/linux/netfilter/nf_synproxy.h
index 6f3791c8946f..00d787f0260e 100644
--- a/include/uapi/linux/netfilter/nf_synproxy.h
+++ b/include/uapi/linux/netfilter/nf_synproxy.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NF_SYNPROXY_H
 #define _NF_SYNPROXY_H
 
diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h
index 8654b2442f6a..592a0c1b77c9 100644
--- a/include/uapi/linux/psp-sev.h
+++ b/include/uapi/linux/psp-sev.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
  * platform management commands.
diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h
index 782069dcf607..4accfa7e266d 100644
--- a/include/uapi/linux/rxrpc.h
+++ b/include/uapi/linux/rxrpc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
 /* Types and definitions for AF_RXRPC.
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h
index 3c9ee3020cbb..652f169a019e 100644
--- a/include/uapi/linux/usb/g_uvc.h
+++ b/include/uapi/linux/usb/g_uvc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * g_uvc.h  --  USB Video Class Gadget driver API
  *
diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h
index 26f39816af14..c27289fd619a 100644
--- a/include/uapi/linux/vbox_vmmdev_types.h
+++ b/include/uapi/linux/vbox_vmmdev_types.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
 /*
  * Virtual Device for Guest <-> VMM/Host communication, type definitions
  * which are also used for the vboxguest ioctl interface / by vboxsf
diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h
index 612f0c7d3558..9cec58a6a5ea 100644
--- a/include/uapi/linux/vboxguest.h
+++ b/include/uapi/linux/vboxguest.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
 /*
  * VBoxGuest - VirtualBox Guest Additions Driver Interface.
  *
diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h
index 9a63ed6d062f..b022787ffb94 100644
--- a/include/uapi/linux/virtio_pmem.h
+++ b/include/uapi/linux/virtio_pmem.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
 /*
  * Definitions for virtio-pmem devices.
  *
diff --git a/include/uapi/linux/vmcore.h b/include/uapi/linux/vmcore.h
index 022619668e0e..3e9da91866ff 100644
--- a/include/uapi/linux/vmcore.h
+++ b/include/uapi/linux/vmcore.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_VMCORE_H
 #define _UAPI_VMCORE_H
 
diff --git a/include/uapi/linux/wmi.h b/include/uapi/linux/wmi.h
index c36f2d7675a4..7085c5dca9fa 100644
--- a/include/uapi/linux/wmi.h
+++ b/include/uapi/linux/wmi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  *  User API methods for ACPI-WMI mapping driver
  *
diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h
index 6d701af9fc42..fb792e882cef 100644
--- a/include/uapi/misc/fastrpc.h
+++ b/include/uapi/misc/fastrpc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
 #ifndef __QCOM_FASTRPC_H__
 #define __QCOM_FASTRPC_H__
diff --git a/include/uapi/rdma/rvt-abi.h b/include/uapi/rdma/rvt-abi.h
index 7328293c715c..7c05a02d2be5 100644
--- a/include/uapi/rdma/rvt-abi.h
+++ b/include/uapi/rdma/rvt-abi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 
 /*
  * This file contains defines, structures, etc. that are used
diff --git a/include/uapi/rdma/siw-abi.h b/include/uapi/rdma/siw-abi.h
index 3dd8071ace7b..7de68f1dc707 100644
--- a/include/uapi/rdma/siw-abi.h
+++ b/include/uapi/rdma/siw-abi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) or BSD-3-Clause */
 
 /* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
 /* Copyright (c) 2008-2019, IBM Corporation */
diff --git a/include/uapi/scsi/scsi_bsg_ufs.h b/include/uapi/scsi/scsi_bsg_ufs.h
index 17c7abd0803a..9988db6ad244 100644
--- a/include/uapi/scsi/scsi_bsg_ufs.h
+++ b/include/uapi/scsi/scsi_bsg_ufs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * UFS Transport SGIO v4 BSG Message Support
  *
diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index f39352cef382..9eee32f5e407 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * skl-tplg-interface.h - Intel DSP FW private data interface
  *
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again
  2019-07-25  7:58 [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Masahiro Yamada
@ 2019-07-25  7:58 ` Masahiro Yamada
  2019-07-25  8:40   ` Thomas Gleixner
  2019-07-25  7:58 ` [PATCH v2 3/3] iomap: fix Invalid License ID Masahiro Yamada
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Masahiro Yamada @ 2019-07-25  7:58 UTC (permalink / raw)
  To: linux-kernel, linux-spdx, Greg KH
  Cc: Thomas Gleixner, alsa-devel, Masahiro Yamada

The "WITH Linux-syscall-note" exception exists for headers exported to
user space. It is strange to add it to non-exported headers.

Commit 687a3e4d8e61 ("treewide: remove SPDX "WITH Linux-syscall-note"
from kernel-space headers") did cleanups some months ago, but it looks
like we need to do this periodically.

This patch was generated by the following script:

  git grep -l -e Linux-syscall-note \
    -- :*.h :^arch/*/include/uapi/asm/*.h :^include/uapi/ :^tools |
  while read file
  do
          sed -i -e 's/(\(GPL-[^[:space:]]*\) WITH Linux-syscall-note)/\1/g' \
          -e 's/ WITH Linux-syscall-note//g' $file
  done

I did not commit drivers/staging/android/uapi/ion.h . This header is
not currently exported, but somebody may plan to move it to include/uapi/
when the time comes. I am not sure. Anyway, it will be better to check
the license inconsistency in drivers/staging/android/uapi/.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 include/sound/sof/control.h   | 2 +-
 include/sound/sof/dai-intel.h | 2 +-
 include/sound/sof/dai.h       | 2 +-
 include/sound/sof/header.h    | 2 +-
 include/sound/sof/info.h      | 2 +-
 include/sound/sof/pm.h        | 2 +-
 include/sound/sof/stream.h    | 2 +-
 include/sound/sof/topology.h  | 2 +-
 include/sound/sof/trace.h     | 2 +-
 include/sound/sof/xtensa.h    | 2 +-
 samples/vfio-mdev/mdpy-defs.h | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/sound/sof/control.h b/include/sound/sof/control.h
index bded69e696d4..6080ea0facd7 100644
--- a/include/sound/sof/control.h
+++ b/include/sound/sof/control.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/dai-intel.h b/include/sound/sof/dai-intel.h
index 4bb8ee138ba7..65e4c20e567c 100644
--- a/include/sound/sof/dai-intel.h
+++ b/include/sound/sof/dai-intel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h
index 3d174e20aa53..5b8de1b1983c 100644
--- a/include/sound/sof/dai.h
+++ b/include/sound/sof/dai.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h
index 12867bbd4372..10f00c08dbb7 100644
--- a/include/sound/sof/header.h
+++ b/include/sound/sof/header.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h
index 16528d2b4a50..a9156b4a062c 100644
--- a/include/sound/sof/info.h
+++ b/include/sound/sof/info.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/pm.h b/include/sound/sof/pm.h
index 8ae3ad45bdf7..003879401d63 100644
--- a/include/sound/sof/pm.h
+++ b/include/sound/sof/pm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/stream.h b/include/sound/sof/stream.h
index 643f175cb479..0b71b381b952 100644
--- a/include/sound/sof/stream.h
+++ b/include/sound/sof/stream.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h
index 41dcabf89899..c47b36240920 100644
--- a/include/sound/sof/topology.h
+++ b/include/sound/sof/topology.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/trace.h b/include/sound/sof/trace.h
index 9257d5473d97..fda6e8f6ead4 100644
--- a/include/sound/sof/trace.h
+++ b/include/sound/sof/trace.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/xtensa.h b/include/sound/sof/xtensa.h
index d25c764b10e8..dd53d36b34e1 100644
--- a/include/sound/sof/xtensa.h
+++ b/include/sound/sof/xtensa.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/samples/vfio-mdev/mdpy-defs.h b/samples/vfio-mdev/mdpy-defs.h
index 96b3b1b49d34..eb26421b6429 100644
--- a/samples/vfio-mdev/mdpy-defs.h
+++ b/samples/vfio-mdev/mdpy-defs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Simple pci display device.
  *
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH v2 3/3] iomap: fix Invalid License ID
  2019-07-25  7:58 [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Masahiro Yamada
  2019-07-25  7:58 ` [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again Masahiro Yamada
@ 2019-07-25  7:58 ` Masahiro Yamada
  2019-07-25  8:41   ` Thomas Gleixner
  2019-07-25  8:40 ` [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Thomas Gleixner
  2019-07-25 13:03 ` Kate Stewart
  3 siblings, 1 reply; 7+ messages in thread
From: Masahiro Yamada @ 2019-07-25  7:58 UTC (permalink / raw)
  To: linux-kernel, linux-spdx, Greg KH
  Cc: Thomas Gleixner, alsa-devel, Masahiro Yamada

Detected by:

  $ ./scripts/spdxcheck.py
  fs/iomap/Makefile: 1:27 Invalid License ID: GPL-2.0-or-newer

Fixes: 1c230208f53d ("iomap: start moving code to fs/iomap/")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - New patch

 fs/iomap/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/iomap/Makefile b/fs/iomap/Makefile
index 2d165388d952..93cd11938bf5 100644
--- a/fs/iomap/Makefile
+++ b/fs/iomap/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-or-newer
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (c) 2019 Oracle.
 # All Rights Reserved.
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers
  2019-07-25  7:58 [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Masahiro Yamada
  2019-07-25  7:58 ` [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again Masahiro Yamada
  2019-07-25  7:58 ` [PATCH v2 3/3] iomap: fix Invalid License ID Masahiro Yamada
@ 2019-07-25  8:40 ` Thomas Gleixner
  2019-07-25 13:03 ` Kate Stewart
  3 siblings, 0 replies; 7+ messages in thread
From: Thomas Gleixner @ 2019-07-25  8:40 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kernel, linux-spdx, Greg KH, alsa-devel

On Thu, 25 Jul 2019, Masahiro Yamada wrote:

> UAPI headers licensed under GPL are supposed to have exception
> "WITH Linux-syscall-note" so that they can be included into non-GPL
> user space application code.
> 
> The exception note is missing in some UAPI headers.
> 
> Some of them slipped in by the treewide conversion commit b24413180f56
> ("License cleanup: add SPDX GPL-2.0 license identifier to files with
> no license"). Just run:
> 
>   $ git show --oneline b24413180f56 -- arch/x86/include/uapi/asm/
> 
> I believe they are not intentional, and should be fixed too.
> 
> This patch was generated by the following script:
> 
>   git grep -l --not -e Linux-syscall-note --and -e SPDX-License-Identifier \
>     -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild |
>   while read file
>   do
>           sed -i -e '/[[:space:]]OR[[:space:]]/s/\(GPL-[^[:space:]]*\)/(\1 WITH Linux-syscall-note)/g' \
>           -e '/[[:space:]]or[[:space:]]/s/\(GPL-[^[:space:]]*\)/(\1 WITH Linux-syscall-note)/g' \
>           -e '/[[:space:]]OR[[:space:]]/!{/[[:space:]]or[[:space:]]/!s/\(GPL-[^[:space:]]*\)/\1 WITH Linux-syscall-note/g}' $file
>   done
> 
> After this patch is applied, there are 5 UAPI headers that do not contain
> "WITH Linux-syscall-note". They are kept untouched since this exception
> applies only to GPL variants.
> 
>   $ git grep --not -e Linux-syscall-note --and -e SPDX-License-Identifier \
>     -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild
>   include/uapi/drm/panfrost_drm.h:/* SPDX-License-Identifier: MIT */
>   include/uapi/linux/batman_adv.h:/* SPDX-License-Identifier: MIT */
>   include/uapi/linux/qemu_fw_cfg.h:/* SPDX-License-Identifier: BSD-3-Clause */
>   include/uapi/linux/vbox_err.h:/* SPDX-License-Identifier: MIT */
>   include/uapi/linux/virtio_iommu.h:/* SPDX-License-Identifier: BSD-3-Clause */
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Thanks for cleaning this up!

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again
  2019-07-25  7:58 ` [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again Masahiro Yamada
@ 2019-07-25  8:40   ` Thomas Gleixner
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Gleixner @ 2019-07-25  8:40 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kernel, linux-spdx, Greg KH, alsa-devel

On Thu, 25 Jul 2019, Masahiro Yamada wrote:

> The "WITH Linux-syscall-note" exception exists for headers exported to
> user space. It is strange to add it to non-exported headers.
> 
> Commit 687a3e4d8e61 ("treewide: remove SPDX "WITH Linux-syscall-note"
> from kernel-space headers") did cleanups some months ago, but it looks
> like we need to do this periodically.
> 
> This patch was generated by the following script:
> 
>   git grep -l -e Linux-syscall-note \
>     -- :*.h :^arch/*/include/uapi/asm/*.h :^include/uapi/ :^tools |
>   while read file
>   do
>           sed -i -e 's/(\(GPL-[^[:space:]]*\) WITH Linux-syscall-note)/\1/g' \
>           -e 's/ WITH Linux-syscall-note//g' $file
>   done
> 
> I did not commit drivers/staging/android/uapi/ion.h . This header is
> not currently exported, but somebody may plan to move it to include/uapi/
> when the time comes. I am not sure. Anyway, it will be better to check
> the license inconsistency in drivers/staging/android/uapi/.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/3] iomap: fix Invalid License ID
  2019-07-25  7:58 ` [PATCH v2 3/3] iomap: fix Invalid License ID Masahiro Yamada
@ 2019-07-25  8:41   ` Thomas Gleixner
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Gleixner @ 2019-07-25  8:41 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: linux-kernel, linux-spdx, Greg KH, alsa-devel

On Thu, 25 Jul 2019, Masahiro Yamada wrote:

> Detected by:
> 
>   $ ./scripts/spdxcheck.py
>   fs/iomap/Makefile: 1:27 Invalid License ID: GPL-2.0-or-newer
> 
> Fixes: 1c230208f53d ("iomap: start moving code to fs/iomap/")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers
  2019-07-25  7:58 [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Masahiro Yamada
                   ` (2 preceding siblings ...)
  2019-07-25  8:40 ` [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Thomas Gleixner
@ 2019-07-25 13:03 ` Kate Stewart
  3 siblings, 0 replies; 7+ messages in thread
From: Kate Stewart @ 2019-07-25 13:03 UTC (permalink / raw)
  To: Masahiro Yamada; +Cc: LKML, linux-spdx, Greg KH, Thomas Gleixner, alsa-devel

On Thu, Jul 25, 2019 at 2:59 AM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> UAPI headers licensed under GPL are supposed to have exception
> "WITH Linux-syscall-note" so that they can be included into non-GPL
> user space application code.
>
> The exception note is missing in some UAPI headers.
>
> Some of them slipped in by the treewide conversion commit b24413180f56
> ("License cleanup: add SPDX GPL-2.0 license identifier to files with
> no license"). Just run:
>
>   $ git show --oneline b24413180f56 -- arch/x86/include/uapi/asm/
>
> I believe they are not intentional, and should be fixed too.
>
> This patch was generated by the following script:
>
>   git grep -l --not -e Linux-syscall-note --and -e SPDX-License-Identifier \
>     -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild |
>   while read file
>   do
>           sed -i -e '/[[:space:]]OR[[:space:]]/s/\(GPL-[^[:space:]]*\)/(\1 WITH Linux-syscall-note)/g' \
>           -e '/[[:space:]]or[[:space:]]/s/\(GPL-[^[:space:]]*\)/(\1 WITH Linux-syscall-note)/g' \
>           -e '/[[:space:]]OR[[:space:]]/!{/[[:space:]]or[[:space:]]/!s/\(GPL-[^[:space:]]*\)/\1 WITH Linux-syscall-note/g}' $file
>   done
>
> After this patch is applied, there are 5 UAPI headers that do not contain
> "WITH Linux-syscall-note". They are kept untouched since this exception
> applies only to GPL variants.
>
>   $ git grep --not -e Linux-syscall-note --and -e SPDX-License-Identifier \
>     -- :arch/*/include/uapi/asm/*.h :include/uapi/ :^*/Kbuild
>   include/uapi/drm/panfrost_drm.h:/* SPDX-License-Identifier: MIT */
>   include/uapi/linux/batman_adv.h:/* SPDX-License-Identifier: MIT */
>   include/uapi/linux/qemu_fw_cfg.h:/* SPDX-License-Identifier: BSD-3-Clause */
>   include/uapi/linux/vbox_err.h:/* SPDX-License-Identifier: MIT */
>   include/uapi/linux/virtio_iommu.h:/* SPDX-License-Identifier: BSD-3-Clause */
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v2:
>   - Fix missing parentheses
>
>  arch/arm64/include/uapi/asm/bpf_perf_event.h   | 2 +-
>  arch/csky/include/uapi/asm/byteorder.h         | 2 +-
>  arch/csky/include/uapi/asm/cachectl.h          | 2 +-
>  arch/csky/include/uapi/asm/perf_regs.h         | 2 +-
>  arch/csky/include/uapi/asm/ptrace.h            | 2 +-
>  arch/csky/include/uapi/asm/sigcontext.h        | 2 +-
>  arch/csky/include/uapi/asm/unistd.h            | 2 +-
>  arch/nds32/include/uapi/asm/auxvec.h           | 2 +-
>  arch/nds32/include/uapi/asm/byteorder.h        | 2 +-
>  arch/nds32/include/uapi/asm/cachectl.h         | 2 +-
>  arch/nds32/include/uapi/asm/fp_udfiex_crtl.h   | 2 +-
>  arch/nds32/include/uapi/asm/param.h            | 2 +-
>  arch/nds32/include/uapi/asm/ptrace.h           | 2 +-
>  arch/nds32/include/uapi/asm/sigcontext.h       | 2 +-
>  arch/nds32/include/uapi/asm/unistd.h           | 2 +-
>  arch/powerpc/include/uapi/asm/bpf_perf_event.h | 2 +-
>  arch/riscv/include/uapi/asm/auxvec.h           | 2 +-
>  arch/riscv/include/uapi/asm/bitsperlong.h      | 2 +-
>  arch/riscv/include/uapi/asm/byteorder.h        | 2 +-
>  arch/riscv/include/uapi/asm/hwcap.h            | 2 +-
>  arch/riscv/include/uapi/asm/ptrace.h           | 2 +-
>  arch/riscv/include/uapi/asm/sigcontext.h       | 2 +-
>  arch/riscv/include/uapi/asm/ucontext.h         | 2 +-
>  arch/s390/include/uapi/asm/bpf_perf_event.h    | 2 +-
>  arch/s390/include/uapi/asm/ipl.h               | 2 +-
>  arch/sh/include/uapi/asm/setup.h               | 2 +-
>  arch/sh/include/uapi/asm/types.h               | 2 +-
>  arch/sparc/include/uapi/asm/oradax.h           | 2 +-
>  arch/x86/include/uapi/asm/byteorder.h          | 2 +-
>  arch/x86/include/uapi/asm/hwcap2.h             | 2 +-
>  arch/x86/include/uapi/asm/sigcontext32.h       | 2 +-
>  arch/x86/include/uapi/asm/types.h              | 2 +-
>  include/uapi/linux/bpfilter.h                  | 2 +-
>  include/uapi/linux/ipmi_bmc.h                  | 2 +-
>  include/uapi/linux/isst_if.h                   | 2 +-
>  include/uapi/linux/netfilter/nf_synproxy.h     | 2 +-
>  include/uapi/linux/psp-sev.h                   | 2 +-
>  include/uapi/linux/rxrpc.h                     | 2 +-
>  include/uapi/linux/usb/g_uvc.h                 | 2 +-
>  include/uapi/linux/vbox_vmmdev_types.h         | 2 +-
>  include/uapi/linux/vboxguest.h                 | 2 +-
>  include/uapi/linux/virtio_pmem.h               | 2 +-
>  include/uapi/linux/vmcore.h                    | 2 +-
>  include/uapi/linux/wmi.h                       | 2 +-
>  include/uapi/misc/fastrpc.h                    | 2 +-
>  include/uapi/rdma/rvt-abi.h                    | 2 +-
>  include/uapi/rdma/siw-abi.h                    | 2 +-
>  include/uapi/scsi/scsi_bsg_ufs.h               | 2 +-
>  include/uapi/sound/skl-tplg-interface.h        | 2 +-
>  49 files changed, 49 insertions(+), 49 deletions(-)
>
> diff --git a/arch/arm64/include/uapi/asm/bpf_perf_event.h b/arch/arm64/include/uapi/asm/bpf_perf_event.h
> index b551b741653d..5e1e648aeec4 100644
> --- a/arch/arm64/include/uapi/asm/bpf_perf_event.h
> +++ b/arch/arm64/include/uapi/asm/bpf_perf_event.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
>  #define _UAPI__ASM_BPF_PERF_EVENT_H__
>
> diff --git a/arch/csky/include/uapi/asm/byteorder.h b/arch/csky/include/uapi/asm/byteorder.h
> index b079ec715cdf..d150cd664873 100644
> --- a/arch/csky/include/uapi/asm/byteorder.h
> +++ b/arch/csky/include/uapi/asm/byteorder.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
>
>  #ifndef __ASM_CSKY_BYTEORDER_H
> diff --git a/arch/csky/include/uapi/asm/cachectl.h b/arch/csky/include/uapi/asm/cachectl.h
> index ddf2f39aa925..ed7fad1ea20d 100644
> --- a/arch/csky/include/uapi/asm/cachectl.h
> +++ b/arch/csky/include/uapi/asm/cachectl.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>
>  #ifndef __ASM_CSKY_CACHECTL_H
>  #define __ASM_CSKY_CACHECTL_H
> diff --git a/arch/csky/include/uapi/asm/perf_regs.h b/arch/csky/include/uapi/asm/perf_regs.h
> index ee323d818592..49d4e147a559 100644
> --- a/arch/csky/include/uapi/asm/perf_regs.h
> +++ b/arch/csky/include/uapi/asm/perf_regs.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
>
>  #ifndef _ASM_CSKY_PERF_REGS_H
> diff --git a/arch/csky/include/uapi/asm/ptrace.h b/arch/csky/include/uapi/asm/ptrace.h
> index 4e248d5b86ef..66b2268e324e 100644
> --- a/arch/csky/include/uapi/asm/ptrace.h
> +++ b/arch/csky/include/uapi/asm/ptrace.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
>
>  #ifndef _CSKY_PTRACE_H
> diff --git a/arch/csky/include/uapi/asm/sigcontext.h b/arch/csky/include/uapi/asm/sigcontext.h
> index e81e7ff11e36..670c020f2cb8 100644
> --- a/arch/csky/include/uapi/asm/sigcontext.h
> +++ b/arch/csky/include/uapi/asm/sigcontext.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
>
>  #ifndef __ASM_CSKY_SIGCONTEXT_H
> diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h
> index ec60e49cea66..211c983c7282 100644
> --- a/arch/csky/include/uapi/asm/unistd.h
> +++ b/arch/csky/include/uapi/asm/unistd.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
>
>  #define __ARCH_WANT_SYS_CLONE
> diff --git a/arch/nds32/include/uapi/asm/auxvec.h b/arch/nds32/include/uapi/asm/auxvec.h
> index b5d58ea8decb..bc0b92ab8c15 100644
> --- a/arch/nds32/include/uapi/asm/auxvec.h
> +++ b/arch/nds32/include/uapi/asm/auxvec.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>
>  #ifndef __ASM_AUXVEC_H
> diff --git a/arch/nds32/include/uapi/asm/byteorder.h b/arch/nds32/include/uapi/asm/byteorder.h
> index 511e653c709d..c264ef12c49c 100644
> --- a/arch/nds32/include/uapi/asm/byteorder.h
> +++ b/arch/nds32/include/uapi/asm/byteorder.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>
>  #ifndef __NDS32_BYTEORDER_H__
> diff --git a/arch/nds32/include/uapi/asm/cachectl.h b/arch/nds32/include/uapi/asm/cachectl.h
> index 73793662815c..31b9b439d819 100644
> --- a/arch/nds32/include/uapi/asm/cachectl.h
> +++ b/arch/nds32/include/uapi/asm/cachectl.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 1994, 1995, 1996 by Ralf Baechle
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>  #ifndef        _ASM_CACHECTL
> diff --git a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h
> index d54a5d6c6538..f17396db16ec 100644
> --- a/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h
> +++ b/arch/nds32/include/uapi/asm/fp_udfiex_crtl.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  /* Copyright (C) 2005-2019 Andes Technology Corporation */
>  #ifndef        _FP_UDF_IEX_CRTL_H
>  #define        _FP_UDF_IEX_CRTL_H
> diff --git a/arch/nds32/include/uapi/asm/param.h b/arch/nds32/include/uapi/asm/param.h
> index 2977534a6bd3..48d00328d328 100644
> --- a/arch/nds32/include/uapi/asm/param.h
> +++ b/arch/nds32/include/uapi/asm/param.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>
>  #ifndef __ASM_NDS32_PARAM_H
> diff --git a/arch/nds32/include/uapi/asm/ptrace.h b/arch/nds32/include/uapi/asm/ptrace.h
> index 1a6e01c00e6f..d76217c7c010 100644
> --- a/arch/nds32/include/uapi/asm/ptrace.h
> +++ b/arch/nds32/include/uapi/asm/ptrace.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>
>  #ifndef __UAPI_ASM_NDS32_PTRACE_H
> diff --git a/arch/nds32/include/uapi/asm/sigcontext.h b/arch/nds32/include/uapi/asm/sigcontext.h
> index dc89af7ddcc3..6c1e6648878f 100644
> --- a/arch/nds32/include/uapi/asm/sigcontext.h
> +++ b/arch/nds32/include/uapi/asm/sigcontext.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>
>  #ifndef _ASMNDS32_SIGCONTEXT_H
> diff --git a/arch/nds32/include/uapi/asm/unistd.h b/arch/nds32/include/uapi/asm/unistd.h
> index a0b2f7b9c0f2..410795e280fe 100644
> --- a/arch/nds32/include/uapi/asm/unistd.h
> +++ b/arch/nds32/include/uapi/asm/unistd.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  // Copyright (C) 2005-2017 Andes Technology Corporation
>
>  #define __ARCH_WANT_STAT64
> diff --git a/arch/powerpc/include/uapi/asm/bpf_perf_event.h b/arch/powerpc/include/uapi/asm/bpf_perf_event.h
> index b551b741653d..5e1e648aeec4 100644
> --- a/arch/powerpc/include/uapi/asm/bpf_perf_event.h
> +++ b/arch/powerpc/include/uapi/asm/bpf_perf_event.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
>  #define _UAPI__ASM_BPF_PERF_EVENT_H__
>
> diff --git a/arch/riscv/include/uapi/asm/auxvec.h b/arch/riscv/include/uapi/asm/auxvec.h
> index 62716653554b..d86cb17bbabe 100644
> --- a/arch/riscv/include/uapi/asm/auxvec.h
> +++ b/arch/riscv/include/uapi/asm/auxvec.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copyright (C) 2012 ARM Ltd.
>   * Copyright (C) 2015 Regents of the University of California
> diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h
> index 0b9b58b57ff6..7d0b32e3b701 100644
> --- a/arch/riscv/include/uapi/asm/bitsperlong.h
> +++ b/arch/riscv/include/uapi/asm/bitsperlong.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copyright (C) 2012 ARM Ltd.
>   * Copyright (C) 2015 Regents of the University of California
> diff --git a/arch/riscv/include/uapi/asm/byteorder.h b/arch/riscv/include/uapi/asm/byteorder.h
> index 1920debc09c0..f671e16bf6af 100644
> --- a/arch/riscv/include/uapi/asm/byteorder.h
> +++ b/arch/riscv/include/uapi/asm/byteorder.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copyright (C) 2012 ARM Ltd.
>   * Copyright (C) 2015 Regents of the University of California
> diff --git a/arch/riscv/include/uapi/asm/hwcap.h b/arch/riscv/include/uapi/asm/hwcap.h
> index 7d786145183b..4e7646077056 100644
> --- a/arch/riscv/include/uapi/asm/hwcap.h
> +++ b/arch/riscv/include/uapi/asm/hwcap.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copied from arch/arm64/include/asm/hwcap.h
>   *
> diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h
> index 92d8f7cd8f84..882547f6bd5c 100644
> --- a/arch/riscv/include/uapi/asm/ptrace.h
> +++ b/arch/riscv/include/uapi/asm/ptrace.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copyright (C) 2012 Regents of the University of California
>   */
> diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h
> index 053f809e52ce..84f2dfcfdbce 100644
> --- a/arch/riscv/include/uapi/asm/sigcontext.h
> +++ b/arch/riscv/include/uapi/asm/sigcontext.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copyright (C) 2012 Regents of the University of California
>   */
> diff --git a/arch/riscv/include/uapi/asm/ucontext.h b/arch/riscv/include/uapi/asm/ucontext.h
> index b58e00cee2ec..411dd7b52ed6 100644
> --- a/arch/riscv/include/uapi/asm/ucontext.h
> +++ b/arch/riscv/include/uapi/asm/ucontext.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Copyright (C) 2012 ARM Ltd.
>   * Copyright (C) 2017 SiFive, Inc.
> diff --git a/arch/s390/include/uapi/asm/bpf_perf_event.h b/arch/s390/include/uapi/asm/bpf_perf_event.h
> index cefe7c7cd4f6..3ed42ff6da94 100644
> --- a/arch/s390/include/uapi/asm/bpf_perf_event.h
> +++ b/arch/s390/include/uapi/asm/bpf_perf_event.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
>  #define _UAPI__ASM_BPF_PERF_EVENT_H__
>
> diff --git a/arch/s390/include/uapi/asm/ipl.h b/arch/s390/include/uapi/asm/ipl.h
> index fd32b1cd80d2..451ba7d08905 100644
> --- a/arch/s390/include/uapi/asm/ipl.h
> +++ b/arch/s390/include/uapi/asm/ipl.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _ASM_S390_UAPI_IPL_H
>  #define _ASM_S390_UAPI_IPL_H
>
> diff --git a/arch/sh/include/uapi/asm/setup.h b/arch/sh/include/uapi/asm/setup.h
> index 1170dd2fb998..4bd19f80f9b0 100644
> --- a/arch/sh/include/uapi/asm/setup.h
> +++ b/arch/sh/include/uapi/asm/setup.h
> @@ -1,2 +1,2 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #include <asm-generic/setup.h>
> diff --git a/arch/sh/include/uapi/asm/types.h b/arch/sh/include/uapi/asm/types.h
> index f83795fdc0da..68100e108ea6 100644
> --- a/arch/sh/include/uapi/asm/types.h
> +++ b/arch/sh/include/uapi/asm/types.h
> @@ -1,2 +1,2 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #include <asm-generic/types.h>
> diff --git a/arch/sparc/include/uapi/asm/oradax.h b/arch/sparc/include/uapi/asm/oradax.h
> index 64c67f2ea33f..0dace69058ab 100644
> --- a/arch/sparc/include/uapi/asm/oradax.h
> +++ b/arch/sparc/include/uapi/asm/oradax.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
>  /*
>   * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
>   */
> diff --git a/arch/x86/include/uapi/asm/byteorder.h b/arch/x86/include/uapi/asm/byteorder.h
> index 484e3cfd7ef2..149143cab9ff 100644
> --- a/arch/x86/include/uapi/asm/byteorder.h
> +++ b/arch/x86/include/uapi/asm/byteorder.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _ASM_X86_BYTEORDER_H
>  #define _ASM_X86_BYTEORDER_H
>
> diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h
> index 6ebaae90e207..8b2effe6efb8 100644
> --- a/arch/x86/include/uapi/asm/hwcap2.h
> +++ b/arch/x86/include/uapi/asm/hwcap2.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _ASM_X86_HWCAP2_H
>  #define _ASM_X86_HWCAP2_H
>
> diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h
> index 6b18e88de8a6..7114801d0499 100644
> --- a/arch/x86/include/uapi/asm/sigcontext32.h
> +++ b/arch/x86/include/uapi/asm/sigcontext32.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _ASM_X86_SIGCONTEXT32_H
>  #define _ASM_X86_SIGCONTEXT32_H
>
> diff --git a/arch/x86/include/uapi/asm/types.h b/arch/x86/include/uapi/asm/types.h
> index df55e1ddb0c9..9d5c11a24279 100644
> --- a/arch/x86/include/uapi/asm/types.h
> +++ b/arch/x86/include/uapi/asm/types.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _ASM_X86_TYPES_H
>  #define _ASM_X86_TYPES_H
>
> diff --git a/include/uapi/linux/bpfilter.h b/include/uapi/linux/bpfilter.h
> index 2ec3cc99ea4c..cbc1f5813f50 100644
> --- a/include/uapi/linux/bpfilter.h
> +++ b/include/uapi/linux/bpfilter.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _UAPI_LINUX_BPFILTER_H
>  #define _UAPI_LINUX_BPFILTER_H
>
> diff --git a/include/uapi/linux/ipmi_bmc.h b/include/uapi/linux/ipmi_bmc.h
> index 1670f0944227..782a03eb1086 100644
> --- a/include/uapi/linux/ipmi_bmc.h
> +++ b/include/uapi/linux/ipmi_bmc.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  /*
>   * Copyright (c) 2015-2018, Intel Corporation.
>   */
> diff --git a/include/uapi/linux/isst_if.h b/include/uapi/linux/isst_if.h
> index d10b832c58c5..0a52b7b093d3 100644
> --- a/include/uapi/linux/isst_if.h
> +++ b/include/uapi/linux/isst_if.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  /*
>   * Intel Speed Select Interface: OS to hardware Interface
>   * Copyright (c) 2019, Intel Corporation.
> diff --git a/include/uapi/linux/netfilter/nf_synproxy.h b/include/uapi/linux/netfilter/nf_synproxy.h
> index 6f3791c8946f..00d787f0260e 100644
> --- a/include/uapi/linux/netfilter/nf_synproxy.h
> +++ b/include/uapi/linux/netfilter/nf_synproxy.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _NF_SYNPROXY_H
>  #define _NF_SYNPROXY_H
>
> diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h
> index 8654b2442f6a..592a0c1b77c9 100644
> --- a/include/uapi/linux/psp-sev.h
> +++ b/include/uapi/linux/psp-sev.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
>   * platform management commands.
> diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h
> index 782069dcf607..4accfa7e266d 100644
> --- a/include/uapi/linux/rxrpc.h
> +++ b/include/uapi/linux/rxrpc.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
>  /* Types and definitions for AF_RXRPC.
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
> diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h
> index 3c9ee3020cbb..652f169a019e 100644
> --- a/include/uapi/linux/usb/g_uvc.h
> +++ b/include/uapi/linux/usb/g_uvc.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
>  /*
>   * g_uvc.h  --  USB Video Class Gadget driver API
>   *
> diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h
> index 26f39816af14..c27289fd619a 100644
> --- a/include/uapi/linux/vbox_vmmdev_types.h
> +++ b/include/uapi/linux/vbox_vmmdev_types.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
> +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
>  /*
>   * Virtual Device for Guest <-> VMM/Host communication, type definitions
>   * which are also used for the vboxguest ioctl interface / by vboxsf
> diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h
> index 612f0c7d3558..9cec58a6a5ea 100644
> --- a/include/uapi/linux/vboxguest.h
> +++ b/include/uapi/linux/vboxguest.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
> +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
>  /*
>   * VBoxGuest - VirtualBox Guest Additions Driver Interface.
>   *
> diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h
> index 9a63ed6d062f..b022787ffb94 100644
> --- a/include/uapi/linux/virtio_pmem.h
> +++ b/include/uapi/linux/virtio_pmem.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
> +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
>  /*
>   * Definitions for virtio-pmem devices.
>   *
> diff --git a/include/uapi/linux/vmcore.h b/include/uapi/linux/vmcore.h
> index 022619668e0e..3e9da91866ff 100644
> --- a/include/uapi/linux/vmcore.h
> +++ b/include/uapi/linux/vmcore.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  #ifndef _UAPI_VMCORE_H
>  #define _UAPI_VMCORE_H
>
> diff --git a/include/uapi/linux/wmi.h b/include/uapi/linux/wmi.h
> index c36f2d7675a4..7085c5dca9fa 100644
> --- a/include/uapi/linux/wmi.h
> +++ b/include/uapi/linux/wmi.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
>  /*
>   *  User API methods for ACPI-WMI mapping driver
>   *
> diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h
> index 6d701af9fc42..fb792e882cef 100644
> --- a/include/uapi/misc/fastrpc.h
> +++ b/include/uapi/misc/fastrpc.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>
>  #ifndef __QCOM_FASTRPC_H__
>  #define __QCOM_FASTRPC_H__
> diff --git a/include/uapi/rdma/rvt-abi.h b/include/uapi/rdma/rvt-abi.h
> index 7328293c715c..7c05a02d2be5 100644
> --- a/include/uapi/rdma/rvt-abi.h
> +++ b/include/uapi/rdma/rvt-abi.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
> +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
>
>  /*
>   * This file contains defines, structures, etc. that are used
> diff --git a/include/uapi/rdma/siw-abi.h b/include/uapi/rdma/siw-abi.h
> index 3dd8071ace7b..7de68f1dc707 100644
> --- a/include/uapi/rdma/siw-abi.h
> +++ b/include/uapi/rdma/siw-abi.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
> +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) or BSD-3-Clause */
>
>  /* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
>  /* Copyright (c) 2008-2019, IBM Corporation */
> diff --git a/include/uapi/scsi/scsi_bsg_ufs.h b/include/uapi/scsi/scsi_bsg_ufs.h
> index 17c7abd0803a..9988db6ad244 100644
> --- a/include/uapi/scsi/scsi_bsg_ufs.h
> +++ b/include/uapi/scsi/scsi_bsg_ufs.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  /*
>   * UFS Transport SGIO v4 BSG Message Support
>   *
> diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
> index f39352cef382..9eee32f5e407 100644
> --- a/include/uapi/sound/skl-tplg-interface.h
> +++ b/include/uapi/sound/skl-tplg-interface.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
>  /*
>   * skl-tplg-interface.h - Intel DSP FW private data interface
>   *
> --
> 2.17.1
>

Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-07-25 13:36 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-25  7:58 [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Masahiro Yamada
2019-07-25  7:58 ` [PATCH v2 2/3] treewide: remove SPDX "WITH Linux-syscall-note" from kernel-space headers again Masahiro Yamada
2019-07-25  8:40   ` Thomas Gleixner
2019-07-25  7:58 ` [PATCH v2 3/3] iomap: fix Invalid License ID Masahiro Yamada
2019-07-25  8:41   ` Thomas Gleixner
2019-07-25  8:40 ` [PATCH v2 1/3] treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers Thomas Gleixner
2019-07-25 13:03 ` Kate Stewart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).