diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-28 19:00:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-28 19:00:06 +0200 |
| commit | ad28fd1cb2bd7d67f9240f596ea4740c95545fdf (patch) | |
| tree | c6b2a579f07bc263b105c534a4567ac3179ba7ac /fs | |
| 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 | linux-ad28fd1cb2bd7d67f9240f596ea4740c95545fdf.tar.xz 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 'fs')
| -rw-r--r-- | fs/iomap/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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. |