diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-20 08:53:16 -0600 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-20 08:53:16 -0600 |
commit | 32d528c4b885108694f613406d9f39fa4873bd37 (patch) | |
tree | 81eb0075d6d8a1879b7466cd06874fa9edd7c94d /arch/m68k | |
parent | 3e0caea7545430a530bec19bb0de6c1c56c04924 (diff) | |
parent | 6cad1ecd4e3213d892b70afa999a81849d1f0206 (diff) | |
download | linux-stable-32d528c4b885108694f613406d9f39fa4873bd37.tar.gz linux-stable-32d528c4b885108694f613406d9f39fa4873bd37.tar.bz2 linux-stable-32d528c4b885108694f613406d9f39fa4873bd37.zip |
Merge tag 'spdx-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX/License additions from Greg KH:
"Here are two small updates for LICENSES and some kernel files that add
the Copyleft-next license and use it in a SPDX tag as a dual-license
for some kernel files.
These have been discussed thoroughly in public on the linux-spdx
mailing list, and have the needed acks on them, as well as having been
in linux-next with no reported issues for quite some time"
* tag 'spdx-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
testing: use the copyleft-next-0.3.1 SPDX tag
LICENSES: Add the copyleft-next-0.3.1 license
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions