diff options
| author | Linus Torvalds | 2019-07-28 19:00:06 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-28 19:00:06 +0200 |
| commit | ad28fd1cb2bd7d67f9240f596ea4740c95545fdf (patch) | |
| tree | c6b2a579f07bc263b105c534a4567ac3179ba7ac /arch/arm64 | |
| parent | Merge tag 'usb-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | iomap: fix Invalid License ID (diff) | |
| download | kernel-qcow2-linux-ad28fd1cb2bd7d67f9240f596ea4740c95545fdf.tar.gz kernel-qcow2-linux-ad28fd1cb2bd7d67f9240f596ea4740c95545fdf.tar.xz kernel-qcow2-linux-ad28fd1cb2bd7d67f9240f596ea4740c95545fdf.zip | |
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.h | 2 |
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__ |