summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-28 10:00:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-28 10:00:06 -0700
commitad28fd1cb2bd7d67f9240f596ea4740c95545fdf (patch)
treec6b2a579f07bc263b105c534a4567ac3179ba7ac /arch/arm64
parent29af915cabd4d51a2306008f84ee447f3a0d4e8f (diff)
parent0ce38c5f929c83dff8ea805f6c6ef2eb97b66431 (diff)
downloadlinux-ad28fd1cb2bd7d67f9240f596ea4740c95545fdf.tar.bz2
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
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/include/uapi/asm/bpf_perf_event.h2
1 files changed, 1 insertions, 1 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__