Skip to content

Commit ff2ae60

Browse files
committed
Merge tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
Pull SPDX updates from Greg KH: "Here are three SPDX patches for 5.7-rc1. One fixes up the SPDX tag for a single driver, while the other two go through the tree and add SPDX tags for all of the .gitignore files as needed. Nothing too complex, but you will get a merge conflict with your current tree, that should be trivial to handle (one file modified by two things, one file deleted.) All three of these have been in linux-next for a while, with no reported issues other than the merge conflict" * tag 'spdx-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: ASoC: MT6660: make spdxcheck.py happy .gitignore: add SPDX License Identifier .gitignore: remove too obvious comments
2 parents 6cd3d40 + 71db3aa commit ff2ae60

File tree

245 files changed

+245
-24
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+245
-24
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
#
23
# NOTE! Don't add files that are generated in specific
34
# subdirectories here. Add them in the ".gitignore" file

Documentation/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
output
23
*.pyc
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
*.example.dts
23
processed-schema*.yaml

Documentation/vm/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
page-types
23
slabinfo

arch/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
i386
23
x86_64

arch/alpha/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/arc/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
uImage

arch/arc/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/arm/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
Image
23
zImage
34
xipImage

arch/arm/boot/compressed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
ashldi3.S
23
bswapsdi2.S
34
font.c

arch/arm/crypto/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
aesbs-core.S
23
sha256-core.S
34
sha512-core.S

arch/arm/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/arm/mach-at91/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
pm_data-offsets.h

arch/arm/mach-omap2/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
pm-asm-offsets.h

arch/arm/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds
23
vdso.so.raw
34
vdsomunge

arch/arm64/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
Image
23
Image.gz

arch/arm64/crypto/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
sha256-core.S
23
sha512-core.S
34
poly1305-core.S

arch/arm64/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/arm64/kernel/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds

arch/arm64/kernel/vdso32/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds
23
vdso.so.raw

arch/ia64/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
gate.lds
23
vmlinux.lds

arch/m68k/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/microblaze/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
linux.bin*
23
simpleImage.*

arch/microblaze/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/mips/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
mkboot
23
elf2ecoff
34
vmlinux.*

arch/mips/boot/compressed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
ashldi3.c
23
bswapsi.c

arch/mips/boot/tools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
relocs

arch/mips/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/mips/tools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
elf-entry
23
loongson3-llsc-check

arch/mips/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
*.so*
23
vdso-*image.c
34
genvdso

arch/nds32/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/nds32/kernel/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds

arch/nios2/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmImage

arch/nios2/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/openrisc/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/parisc/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
image
23
bzImage

arch/parisc/boot/compressed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
firmware.c
23
real2.S
34
sizes.h

arch/parisc/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/powerpc/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
addnote
23
decompress_inflate.c
34
empty.c

arch/powerpc/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
prom_init_check
23
vmlinux.lds

arch/powerpc/kernel/vdso32/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso32.lds
23
vdso32.so.dbg

arch/powerpc/kernel/vdso64/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso64.lds
23
vdso64.so.dbg
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
spu_save_dump.h
23
spu_restore_dump.h

arch/powerpc/purgatory/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
kexec-purgatory.c
23
purgatory.ro

arch/riscv/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
Image
23
Image.gz
34
loader

arch/riscv/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
/vmlinux.lds

arch/riscv/kernel/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds
23
*.tmp

arch/s390/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
image
23
bzImage
34
section_cmp.*

arch/s390/boot/compressed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux
23
vmlinux.lds

arch/s390/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/s390/kernel/vdso64/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso64.lds

arch/s390/purgatory/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
purgatory
23
purgatory.chk
34
purgatory.lds

arch/s390/tools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
gen_facilities
23
gen_opcode_table

arch/sh/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
zImage
23
vmlinux*
34
uImage*

arch/sh/boot/compressed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
ashiftrt.S
23
ashldi3.c
34
ashlsi3.S

arch/sh/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/sh/kernel/vsyscall/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vsyscall.lds

arch/sparc/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
btfix.S
23
btfixupprep
34
image

arch/sparc/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

arch/sparc/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds
23
vdso-image-*.c
34
vdso2c

arch/sparc/vdso/vdso32/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso32.lds

arch/um/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
kernel/config.c
23
kernel/config.tmp
34
kernel/vmlinux.lds

arch/unicore32/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
#
23
# Generated include files
34
#

arch/x86/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
boot/compressed/vmlinux
23
tools/test_get_len
34
tools/insn_sanity

arch/x86/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
bootsect
23
bzImage
34
cpustr.h

arch/x86/boot/compressed/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
relocs
23
vmlinux.bin.all
34
vmlinux.relocs

arch/x86/boot/tools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
build

arch/x86/crypto/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
poly1305-x86_64-cryptogams.S

arch/x86/entry/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds
23
vdsox32.lds
34
vdso32-syscall-syms.lds

arch/x86/entry/vdso/vdso32/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso32.lds

arch/x86/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vsyscall.lds
23
vsyscall_32.lds
34
vmlinux.lds

arch/x86/kernel/cpu/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
capflags.c

arch/x86/lib/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
inat-tables.c

arch/x86/realmode/rm/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
pasyms.h
23
realmode.lds
34
realmode.relocs

arch/x86/tools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
relocs

arch/x86/um/vdso/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vdso.lds

arch/xtensa/boot/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
uImage
23
zImage.redboot

arch/xtensa/boot/boot-elf/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
boot.lds

arch/xtensa/boot/lib/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
inffast.c
23
inflate.c
34
inftrees.c

arch/xtensa/kernel/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
vmlinux.lds

certs/.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
#
2-
# Generated files
3-
#
1+
# SPDX-License-Identifier: GPL-2.0-only
42
x509_certificate_list

drivers/atm/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Ignore generated files
1+
# SPDX-License-Identifier: GPL-2.0-only
22
fore200e_mkfirm
33
fore200e_pca_fw.c
44
pca200e.bin

drivers/crypto/vmx/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
aesp8-ppc.S
23
ghashp8-ppc.S

drivers/eisa/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
devlist.h

drivers/gpu/drm/i915/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
*.hdrtest

drivers/gpu/drm/radeon/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
mkregtable
23
*_reg_safe.h
34

drivers/memory/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
ti-emif-asm-offsets.h

drivers/net/wan/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
wanxlfw.inc

drivers/scsi/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
53c700_d.h
23
scsi_devinfo_tbl.c

drivers/scsi/aic7xxx/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
aic79xx_reg.h
23
aic79xx_reg_print.c
34
aic79xx_seq.h

drivers/staging/comedi/drivers/ni_routing/tools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
comedi_h.py
23
*.pyc
34
ni_values.py
+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
loopback_test

drivers/video/logo/.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#
2-
# Generated files
3-
#
1+
# SPDX-License-Identifier: GPL-2.0-only
42
*_mono.c
53
*_vga16.c
64
*_clut224.c

drivers/zorro/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
devlist.h
23
gen-devlist

fs/unicode/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
mkutf8data
23
utf8data.h

kernel/.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#
2-
# Generated files
3-
#
1+
# SPDX-License-Identifier: GPL-2.0-only
42
kheaders.md5
53
timeconst.h
64
hz.bc

kernel/debug/kdb/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
12
gen-kdb_cmds.c

lib/.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#
2-
# Generated files
3-
#
1+
# SPDX-License-Identifier: GPL-2.0-only
42
gen_crc32table
53
gen_crc64table
64
crc32table.h

0 commit comments

Comments
 (0)